risingdamdev
diff --git a/‎lib/hot-reload-api.js
Copy file name to clipboardExpand all lines: lib/hot-reload-api.js
+30-44Lines changed: 30 additions & 44 deletions b/‎lib/hot-reload-api.js
Copy file name to clipboardExpand all lines: lib/hot-reload-api.js
+30-44Lines changed: 30 additions & 44 deletions
@@ -1,14 +1,13 @@
-/**
- * override component directive's resolveComponent function.
- * When component is resolved:
- *   - remove self from previous component's list
- *   - add self to current component's list
- */
-
-var Vue
+var Vue // late bind
 var map = Object.create(null)
 var shimmed = false
 
+/**
+ * Determine compatibility and apply patch.
+ *
+ * @param {Function} vue
+ */
+
 exports.install = function (vue) {
   if (shimmed) return
   shimmed = true
@@ -23,25 +22,26 @@ exports.install = function (vue) {
     return
   }
 
-  // shim component
-  shimComponent(Vue.internalDirectives.component)
+  // patch view directive
+  patchView(Vue.internalDirectives.component)
   console.log('[HMR] vue component hot reload shim applied.')
   // shim router-view if present
   var routerView = Vue.elementDirective('router-view')
   if (routerView) {
-    shimComponent(routerView)
+    patchView(routerView)
     console.log('[HMR] vue-router <router-view> hot reload shim applied.')
   }
 }
 
 /**
- * Shim the component directive.
+ * Shim the view directive (component or router-view).
  *
- * @param {Object} dir
+ * @param {Object} View
  */
 
-function shimComponent (dir) {
-  shimMethod(dir, 'unbuild', function (defer) {
+function patchView (View) {
+  var unbuild = View.unbuild
+  View.unbuild = function (defer) {
     if (!this.hotUpdating) {
       var prevComponent = this.childVM && this.childVM.constructor
       removeComponent(prevComponent, this)
@@ -51,57 +51,43 @@ function shimComponent (dir) {
         addComponent(this.Component, this)
       }
     }
-  })
-}
-
-/**
- * Shim a directive method.
- *
- * @param {Object} dir
- * @param {String} methodName
- * @param {Function} fn
- */
-
-function shimMethod (dir, methodName, fn) {
-  var original = dir[methodName]
-  dir[methodName] = function () {
-    fn.apply(this, arguments)
-    return original.apply(this, arguments)
+    // call original
+    return unbuild.call(this, defer)
   }
 }
 
 /**
- * Remove a component view from a Component's hot list
+ * Add a component view to a Component's hot list
  *
  * @param {Function} Component
  * @param {Directive} view - view directive instance
  */
 
-function removeComponent (Component, view) {
+function addComponent (Component, view) {
   var id = Component && Component.options.hotID
   if (id) {
-    map[id].views.$remove(view)
+    if (!map[id]) {
+      map[id] = {
+        Component: Component,
+        views: [],
+        instances: []
+      }
+    }
+    map[id].views.push(view)
   }
 }
 
 /**
- * Add a component view to a Component's hot list
+ * Remove a component view from a Component's hot list
  *
  * @param {Function} Component
  * @param {Directive} view - view directive instance
  */
 
-function addComponent (Component, view) {
+function removeComponent (Component, view) {
   var id = Component && Component.options.hotID
   if (id) {
-    if (!map[id]) {
-      map[id] = {
-        Component: Component,
-        views: [],
-        instances: []
-      }
-    }
-    map[id].views.push(view)
+    map[id].views.$remove(view)
   }
 }