fixed bad merge

inertiajs · Jan 10, 2025 · 5454328 · 5454328
1 parent b0bd53b
commit 5454328
Showing 1 changed file with 4 additions and 19 deletions.
diff --git a/packages/core/src/page.ts b/packages/core/src/page.ts
@@ -69,9 +69,6 @@ class CurrentPage {
         this.page = page
         this.cleared = false
 
-        this.page = page
-        this.cleared = false
-
         if (isNewComponent) {
           this.fireEventsFor('newComponent')
         }
@@ -87,23 +84,11 @@ class CurrentPage {
             Scroll.reset()
           }
 
-          if (this.isFirstPageLoad) {
-            this.fireEventsFor('firstLoad')
-          }
-
-          this.isFirstPageLoad = false
-
-          return this.swap({ component, page, preserveState }).then(() => {
-            if (!preserveScroll) {
-              Scroll.reset()
-            }
+          eventHandler.fireInternalEvent('loadDeferredProps')
 
-            eventHandler.fireInternalEvent('loadDeferredProps')
-
-            if (!replace) {
-              fireNavigateEvent(page)
-            }
-          })
+          if (!replace) {
+            fireNavigateEvent(page)
+          }
         })
       })
     })