[build] 2.0.0-rc.5

Author: yyx990803

dist/vue.common.js

@@ -1434,7 +1434,8 @@ function cloneVNodes (vnodes) {
 
 function normalizeChildren (
   children,
-  ns
+  ns,
+  nestedIndex
 ) {
   if (isPrimitive(children)) {
     return [createTextVNode(children)]
@@ -1446,7 +1447,7 @@ function normalizeChildren (
       var last = res[res.length - 1]
       //  nested
       if (Array.isArray(c)) {
-        res.push.apply(res, normalizeChildren(c, ns))
+        res.push.apply(res, normalizeChildren(c, ns, i))
       } else if (isPrimitive(c)) {
         if (last && last.text) {
           last.text += String(c)
@@ -1462,6 +1463,10 @@ function normalizeChildren (
           if (ns) {
             applyNS(c, ns)
           }
+          // default key for nested array children (likely generated by v-for)
+          if (c.key == null && nestedIndex != null) {
+            c.key = "__vlist_" + nestedIndex + "_" + i + "__"
+          }
           res.push(c)
         }
       }
@@ -1533,13 +1538,15 @@ function updateListeners (
         }
         add(event, cur.invoker, capture)
       }
-    } else if (Array.isArray(old)) {
-      old.length = cur.length
-      for (var i = 0; i < old.length; i++) old[i] = cur[i]
-      on[name] = old
-    } else {
-      old.fn = cur
-      on[name] = old
+    } else if (cur !== old) {
+      if (Array.isArray(old)) {
+        old.length = cur.length
+        for (var i = 0; i < old.length; i++) old[i] = cur[i]
+        on[name] = old
+      } else {
+        old.fn = cur
+        on[name] = old
+      }
     }
   }
   for (name in oldOn) {
@@ -2142,13 +2149,6 @@ function renderMixin (Vue) {
     var staticRenderFns = ref.staticRenderFns;
     var _parentVnode = ref._parentVnode;
 
-    if (vm._isMounted) {
-      // clone slot nodes on re-renders
-      for (var key in vm.$slots) {
-        vm.$slots[key] = cloneVNodes(vm.$slots[key])
-      }
-    }
-
     if (staticRenderFns && !vm._staticTrees) {
       vm._staticTrees = []
     }
@@ -2261,6 +2261,30 @@ function renderMixin (Vue) {
     return ret
   }
 
+  // renderSlot
+  Vue.prototype._t = function (
+    name,
+    fallback
+  ) {
+    var slotNodes = this.$slots[name]
+    if (slotNodes) {
+      // warn duplicate slot usage
+      if (process.env.NODE_ENV !== 'production') {
+        slotNodes._rendered && warn(
+          "Duplicate presense of slot \"" + name + "\" found in the same render tree " +
+          "- this will likely cause render errors.",
+          this
+        )
+        slotNodes._rendered = true
+      }
+      // clone slot nodes on re-renders
+      if (this._isMounted) {
+        slotNodes = cloneVNodes(slotNodes)
+      }
+    }
+    return slotNodes || fallback
+  }
+
   // apply v-bind object
   Vue.prototype._b = function bindProps (
     vnode,
@@ -3261,7 +3285,7 @@ Object.defineProperty(Vue.prototype, '$isServer', {
   get: function () { return config._isServer; }
 })
 
-Vue.version = '2.0.0-rc.4'
+Vue.version = '2.0.0-rc.5'
 
 /*  */
 
@@ -3704,7 +3728,7 @@ function createPatchFunction (backend) {
   }
 
   function createElm (vnode, insertedVnodeQueue, nested) {
-    var i, elm
+    var i
     var data = vnode.data
     vnode.isRootInsert = !nested
     if (isDef(data)) {
@@ -3735,28 +3759,32 @@ function createPatchFunction (backend) {
           )
         }
       }
-      elm = vnode.elm = vnode.ns
+      vnode.elm = vnode.ns
         ? nodeOps.createElementNS(vnode.ns, tag)
         : nodeOps.createElement(tag)
       setScope(vnode)
-      if (Array.isArray(children)) {
-        for (i = 0; i < children.length; ++i) {
-          nodeOps.appendChild(elm, createElm(children[i], insertedVnodeQueue, true))
-        }
-      } else if (isPrimitive(vnode.text)) {
-        nodeOps.appendChild(elm, nodeOps.createTextNode(vnode.text))
-      }
+      createChildren(vnode, children, insertedVnodeQueue)
       if (isDef(data)) {
         invokeCreateHooks(vnode, insertedVnodeQueue)
       }
     } else if (vnode.isComment) {
-      elm = vnode.elm = nodeOps.createComment(vnode.text)
+      vnode.elm = nodeOps.createComment(vnode.text)
     } else {
-      elm = vnode.elm = nodeOps.createTextNode(vnode.text)
+      vnode.elm = nodeOps.createTextNode(vnode.text)
     }
     return vnode.elm
   }
 
+  function createChildren (vnode, children, insertedVnodeQueue) {
+    if (Array.isArray(children)) {
+      for (var i = 0; i < children.length; ++i) {
+        nodeOps.appendChild(vnode.elm, createElm(children[i], insertedVnodeQueue, true))
+      }
+    } else if (isPrimitive(vnode.text)) {
+      nodeOps.appendChild(vnode.elm, nodeOps.createTextNode(vnode.text))
+    }
+  }
+
   function isPatchable (vnode) {
     while (vnode.child) {
       vnode = vnode.child._vnode
@@ -3954,7 +3982,7 @@ function createPatchFunction (backend) {
     // reuse element for static trees.
     // note we only do this if the vnode is cloned -
     // if the new node is not cloned it means the render functions have been
-    // reset by the hot-reload-api and we need to a proper re-render.
+    // reset by the hot-reload-api and we need to do a proper re-render.
     if (vnode.isStatic &&
         oldVnode.isStatic &&
         vnode.key === oldVnode.key &&
@@ -4028,26 +4056,31 @@ function createPatchFunction (backend) {
     if (isDef(tag)) {
       if (isDef(children)) {
         var childNodes = nodeOps.childNodes(elm)
-        var childrenMatch = true
-        if (childNodes.length !== children.length) {
-          childrenMatch = false
+        // empty element, allow client to pick up and populate children
+        if (!childNodes.length) {
+          createChildren(vnode, children, insertedVnodeQueue)
         } else {
-          for (var i$1 = 0; i$1 < children.length; i$1++) {
-            if (!hydrate(childNodes[i$1], children[i$1], insertedVnodeQueue)) {
-              childrenMatch = false
-              break
+          var childrenMatch = true
+          if (childNodes.length !== children.length) {
+            childrenMatch = false
+          } else {
+            for (var i$1 = 0; i$1 < children.length; i$1++) {
+              if (!hydrate(childNodes[i$1], children[i$1], insertedVnodeQueue)) {
+                childrenMatch = false
+                break
+              }
             }
           }
-        }
-        if (!childrenMatch) {
-          if (process.env.NODE_ENV !== 'production' &&
-              typeof console !== 'undefined' &&
-              !bailed) {
-            bailed = true
-            console.warn('Parent: ', elm)
-            console.warn('Mismatching childNodes vs. VNodes: ', childNodes, children)
+          if (!childrenMatch) {
+            if (process.env.NODE_ENV !== 'production' &&
+                typeof console !== 'undefined' &&
+                !bailed) {
+              bailed = true
+              console.warn('Parent: ', elm)
+              console.warn('Mismatching childNodes vs. VNodes: ', childNodes, children)
+            }
+            return false
           }
-          return false
         }
       }
       if (isDef(data)) {
@@ -4142,9 +4175,18 @@ function createPatchFunction (backend) {
 
 var directives = {
   create: function bindDirectives (oldVnode, vnode) {
-    mergeVNodeHook(vnode.data.hook || (vnode.data.hook = {}), 'insert', function () {
-      applyDirectives(oldVnode, vnode, 'bind')
+    var hasInsert = false
+    forEachDirective(oldVnode, vnode, function (def, dir) {
+      callHook$1(def, dir, 'bind', vnode, oldVnode)
+      if (def.inserted) {
+        hasInsert = true
+      }
     })
+    if (hasInsert) {
+      mergeVNodeHook(vnode.data.hook || (vnode.data.hook = {}), 'insert', function () {
+        applyDirectives(oldVnode, vnode, 'inserted')
+      })
+    }
   },
   update: function updateDirectives (oldVnode, vnode) {
     applyDirectives(oldVnode, vnode, 'update')
@@ -4164,32 +4206,47 @@ var directives = {
 
 var emptyModifiers = Object.create(null)
 
-function applyDirectives (
+function forEachDirective (
   oldVnode,
   vnode,
-  hook
+  fn
 ) {
   var dirs = vnode.data.directives
   if (dirs) {
-    var oldDirs = oldVnode.data.directives
-    var isUpdate = hook === 'update' || hook === 'componentUpdated'
     for (var i = 0; i < dirs.length; i++) {
       var dir = dirs[i]
       var def = resolveAsset(vnode.context.$options, 'directives', dir.name, true)
-      var fn = def && def[hook]
-      if (fn) {
-        if (isUpdate && oldDirs) {
+      if (def) {
+        var oldDirs = oldVnode && oldVnode.data.directives
+        if (oldDirs) {
           dir.oldValue = oldDirs[i].value
         }
         if (!dir.modifiers) {
           dir.modifiers = emptyModifiers
         }
-        fn(vnode.elm, dir, vnode, oldVnode)
+        fn(def, dir)
       }
     }
   }
 }
 
+function applyDirectives (
+  oldVnode,
+  vnode,
+  hook
+) {
+  forEachDirective(oldVnode, vnode, function (def, dir) {
+    callHook$1(def, dir, hook, vnode, oldVnode)
+  })
+}
+
+function callHook$1 (def, dir, hook, vnode, oldVnode) {
+  var fn = def && def[hook]
+  if (fn) {
+    fn(vnode.elm, dir, vnode, oldVnode)
+  }
+}
+
 var baseModules = [
   ref,
   directives
@@ -5019,7 +5076,7 @@ var show = {
 
     vnode = locateNode(vnode)
     var transition = vnode.data && vnode.data.transition
-    if (value && transition && transition.appear && !isIE9) {
+    if (value && transition && !isIE9) {
       enter(vnode)
     }
     var originalDisplay = el.style.display === 'none' ? '' : el.style.display
@@ -5249,7 +5306,7 @@ var TransitionGroup = {
     for (var i = 0; i < rawChildren.length; i++) {
       var c = rawChildren[i]
       if (c.tag) {
-        if (c.key != null) {
+        if (c.key != null && String(c.key).indexOf('__vlist') !== 0) {
           children.push(c)
           map[c.key] = c
           ;(c.data || (c.data = {})).transition = transitionData