refactor: a little bit more refactoring

Author: ronald-d-rogers

src/components/view.js

@@ -71,11 +71,6 @@ export default {
     // in case the same component instance is reused across different routes
     ;(data.hook || (data.hook = {})).prepatch = (_, vnode) => {
       matched.instances[name] = vnode.componentInstance
-      // if the route transition has already been confirmed then we weren't
-      // able to call the cb during confirmation as the component was not
-      // registered yet, so we call it here.
-      matched.enteredCbs
-      handleRouteEntered(matched, name)
     }
 
     // register instance in init hook
@@ -86,7 +81,12 @@ export default {
         vnode.componentInstance !== matched.instances[name]
       ) {
         matched.instances[name] = vnode.componentInstance
-        handleRouteEntered(matched, name)
+        // if the route transition has already been confirmed then we weren't
+        // able to call the cbs during confirmation as the component was not
+        // registered yet, so we call it here.
+        if (matched.enteredCbs[name]) {
+          handleRouteEntered(matched, name)
+        }
       }
     }
 

src/history/base.js

@@ -324,7 +324,9 @@ function bindEnterGuard (
         cbs.push(() => {
           // if the instance is registered call the cb here, otherwise it will
           // get called when it is registered in the component's lifecycle hooks
-          handleRouteEntered(match, key)
+          if (match.instances[key]) {
+            handleRouteEntered(match, key)
+          }
         })
       }
       next(cb)

src/util/route.js

@@ -132,12 +132,11 @@ function queryIncludes (current: Dictionary<string>, target: Dictionary<string>)
 }
 
 export function handleRouteEntered (record: RouteRecord, name: string) {
-  if (record.instances[name] && record.enteredCbs[name]) {
-    const instance = record.instances[name]
-    const cbs = record.enteredCbs[name]
-    delete record.enteredCbs[name]
-    for (let i = 0; i < cbs.length; i++) {
-      cbs[i](instance)
-    }
+  const instance = record.instances[name]
+  const cbs = record.enteredCbs[name]
+  if (!instance || !cbs) return
+  delete record.enteredCbs[name]
+  for (let i = 0; i < cbs.length; i++) {
+    cbs[i](instance)
   }
 }