[build] 2.1.6

usench · Dec 13, 2016 · 06c4f2a · 06c4f2a
1 parent 31347d1
commit 06c4f2a
Show file tree

Hide file tree

Showing 11 changed files with 54 additions and 38 deletions.
diff --git a/dist/vue.common.js b/dist/vue.common.js
@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.1.5
+ * Vue.js v2.1.6
  * (c) 2014-2016 Evan You
  * Released under the MIT License.
  */
@@ -2764,7 +2764,7 @@ function normalizeArrayChildren (children, nestedIndex) {
   var i, c, last;
   for (i = 0; i < children.length; i++) {
     c = children[i];
-    if (c == null) { continue }
+    if (c == null || typeof c === 'boolean') { continue }
     last = res[res.length - 1];
     //  nested
     if (Array.isArray(c)) {
@@ -3587,7 +3587,7 @@ Object.defineProperty(Vue$3.prototype, '$isServer', {
   get: isServerRendering
 });
 
-Vue$3.version = '2.1.5';
+Vue$3.version = '2.1.6';
 
 /*  */
 
@@ -3724,7 +3724,7 @@ var isHTMLTag = makeMap(
 // this map is intentionally selective, only covering SVG elements that may
 // contain child elements.
 var isSVG = makeMap(
-  'svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,font,' +
+  'svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,' +
   'font-face,g,glyph,image,line,marker,mask,missing-glyph,path,pattern,' +
   'polygon,polyline,rect,switch,symbol,text,textpath,tspan,use,view',
   true
@@ -7698,14 +7698,18 @@ function genChildren (el, checkSkip) {
 function canSkipNormalization (children) {
   for (var i = 0; i < children.length; i++) {
     var el = children[i];
-    if (el.for || el.tag === 'template' || el.tag === 'slot' ||
-      (el.if && el.ifConditions.some(function (c) { return c.tag === 'template'; }))) {
+    if (needsNormalization(el) ||
+        (el.if && el.ifConditions.some(function (c) { return needsNormalization(c.block); }))) {
       return false
     }
   }
   return true
 }
 
+function needsNormalization (el) {
+  return el.for || el.tag === 'template' || el.tag === 'slot'
+}
+
 function genNode (node) {
   if (node.type === 1) {
     return genElement(node)

diff --git a/dist/vue.js b/dist/vue.js
@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.1.5
+ * Vue.js v2.1.6
  * (c) 2014-2016 Evan You
  * Released under the MIT License.
  */
@@ -2766,7 +2766,7 @@ function normalizeArrayChildren (children, nestedIndex) {
   var i, c, last;
   for (i = 0; i < children.length; i++) {
     c = children[i];
-    if (c == null) { continue }
+    if (c == null || typeof c === 'boolean') { continue }
     last = res[res.length - 1];
     //  nested
     if (Array.isArray(c)) {
@@ -3587,7 +3587,7 @@ Object.defineProperty(Vue$3.prototype, '$isServer', {
   get: isServerRendering
 });
 
-Vue$3.version = '2.1.5';
+Vue$3.version = '2.1.6';
 
 /*  */
 
@@ -3724,7 +3724,7 @@ var isHTMLTag = makeMap(
 // this map is intentionally selective, only covering SVG elements that may
 // contain child elements.
 var isSVG = makeMap(
-  'svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,font,' +
+  'svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,' +
   'font-face,g,glyph,image,line,marker,mask,missing-glyph,path,pattern,' +
   'polygon,polyline,rect,switch,symbol,text,textpath,tspan,use,view',
   true
@@ -7698,14 +7698,18 @@ function genChildren (el, checkSkip) {
 function canSkipNormalization (children) {
   for (var i = 0; i < children.length; i++) {
     var el = children[i];
-    if (el.for || el.tag === 'template' || el.tag === 'slot' ||
-      (el.if && el.ifConditions.some(function (c) { return c.tag === 'template'; }))) {
+    if (needsNormalization(el) ||
+        (el.if && el.ifConditions.some(function (c) { return needsNormalization(c.block); }))) {
       return false
     }
   }
   return true
 }
 
+function needsNormalization (el) {
+  return el.for || el.tag === 'template' || el.tag === 'slot'
+}
+
 function genNode (node) {
   if (node.type === 1) {
     return genElement(node)

diff --git a/dist/vue.min.js b/dist/vue.min.js
diff --git a/dist/vue.runtime.common.js b/dist/vue.runtime.common.js
@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.1.5
+ * Vue.js v2.1.6
  * (c) 2014-2016 Evan You
  * Released under the MIT License.
  */
@@ -2764,7 +2764,7 @@ function normalizeArrayChildren (children, nestedIndex) {
   var i, c, last;
   for (i = 0; i < children.length; i++) {
     c = children[i];
-    if (c == null) { continue }
+    if (c == null || typeof c === 'boolean') { continue }
     last = res[res.length - 1];
     //  nested
     if (Array.isArray(c)) {
@@ -3587,7 +3587,7 @@ Object.defineProperty(Vue$2.prototype, '$isServer', {
   get: isServerRendering
 });
 
-Vue$2.version = '2.1.5';
+Vue$2.version = '2.1.6';
 
 /*  */
 
@@ -3724,7 +3724,7 @@ var isHTMLTag = makeMap(
 // this map is intentionally selective, only covering SVG elements that may
 // contain child elements.
 var isSVG = makeMap(
-  'svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,font,' +
+  'svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,' +
   'font-face,g,glyph,image,line,marker,mask,missing-glyph,path,pattern,' +
   'polygon,polyline,rect,switch,symbol,text,textpath,tspan,use,view',
   true

diff --git a/dist/vue.runtime.js b/dist/vue.runtime.js
@@ -1,5 +1,5 @@
 /*!
- * Vue.js v2.1.5
+ * Vue.js v2.1.6
  * (c) 2014-2016 Evan You
  * Released under the MIT License.
  */
@@ -2766,7 +2766,7 @@ function normalizeArrayChildren (children, nestedIndex) {
   var i, c, last;
   for (i = 0; i < children.length; i++) {
     c = children[i];
-    if (c == null) { continue }
+    if (c == null || typeof c === 'boolean') { continue }
     last = res[res.length - 1];
     //  nested
     if (Array.isArray(c)) {
@@ -3587,7 +3587,7 @@ Object.defineProperty(Vue$2.prototype, '$isServer', {
   get: isServerRendering
 });
 
-Vue$2.version = '2.1.5';
+Vue$2.version = '2.1.6';
 
 /*  */
 
@@ -3724,7 +3724,7 @@ var isHTMLTag = makeMap(
 // this map is intentionally selective, only covering SVG elements that may
 // contain child elements.
 var isSVG = makeMap(
-  'svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,font,' +
+  'svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,' +
   'font-face,g,glyph,image,line,marker,mask,missing-glyph,path,pattern,' +
   'polygon,polyline,rect,switch,symbol,text,textpath,tspan,use,view',
   true

diff --git a/dist/vue.runtime.min.js b/dist/vue.runtime.min.js
diff --git a/examples/svg/index.html b/examples/svg/index.html
@@ -5,7 +5,7 @@
     <title>Vue.js SVG graph example</title>
     <link rel="stylesheet" href="style.css">
     <!-- Delete ".min" for console warnings in development -->
-    <script src="../../dist/vue.min.js"></script>
+    <script src="../../dist/vue.js"></script>
   </head>
   <body>
 

diff --git a/packages/vue-server-renderer/build.js b/packages/vue-server-renderer/build.js
@@ -2308,14 +2308,18 @@ function genChildren (el, checkSkip) {
 function canSkipNormalization (children) {
   for (var i = 0; i < children.length; i++) {
     var el = children[i];
-    if (el.for || el.tag === 'template' || el.tag === 'slot' ||
-      (el.if && el.ifConditions.some(function (c) { return c.tag === 'template'; }))) {
+    if (needsNormalization(el) ||
+        (el.if && el.ifConditions.some(function (c) { return needsNormalization(c.block); }))) {
       return false
     }
   }
   return true
 }
 
+function needsNormalization (el) {
+  return el.for || el.tag === 'template' || el.tag === 'slot'
+}
+
 function genNode (node) {
   if (node.type === 1) {
     return genElement(node)
@@ -4532,7 +4536,7 @@ function normalizeArrayChildren (children, nestedIndex) {
   var i, c, last;
   for (i = 0; i < children.length; i++) {
     c = children[i];
-    if (c == null) { continue }
+    if (c == null || typeof c === 'boolean') { continue }
     last = res[res.length - 1];
     //  nested
     if (Array.isArray(c)) {
@@ -5734,7 +5738,7 @@ var isHTMLTag = makeMap(
 // this map is intentionally selective, only covering SVG elements that may
 // contain child elements.
 var isSVG = makeMap(
-  'svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,font,' +
+  'svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,' +
   'font-face,g,glyph,image,line,marker,mask,missing-glyph,path,pattern,' +
   'polygon,polyline,rect,switch,symbol,text,textpath,tspan,use,view',
   true

diff --git a/packages/vue-server-renderer/package.json b/packages/vue-server-renderer/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-server-renderer",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "server renderer for Vue 2.0",
   "main": "index.js",
   "repository": {

diff --git a/packages/vue-template-compiler/build.js b/packages/vue-template-compiler/build.js
@@ -2183,14 +2183,18 @@ function genChildren (el, checkSkip) {
 function canSkipNormalization (children) {
   for (var i = 0; i < children.length; i++) {
     var el = children[i];
-    if (el.for || el.tag === 'template' || el.tag === 'slot' ||
-      (el.if && el.ifConditions.some(function (c) { return c.tag === 'template'; }))) {
+    if (needsNormalization(el) ||
+        (el.if && el.ifConditions.some(function (c) { return needsNormalization(c.block); }))) {
       return false
     }
   }
   return true
 }
 
+function needsNormalization (el) {
+  return el.for || el.tag === 'template' || el.tag === 'slot'
+}
+
 function genNode (node) {
   if (node.type === 1) {
     return genElement(node)
@@ -4381,7 +4385,7 @@ function normalizeArrayChildren (children, nestedIndex) {
   var i, c, last;
   for (i = 0; i < children.length; i++) {
     c = children[i];
-    if (c == null) { continue }
+    if (c == null || typeof c === 'boolean') { continue }
     last = res[res.length - 1];
     //  nested
     if (Array.isArray(c)) {
@@ -5557,7 +5561,7 @@ var isHTMLTag = makeMap(
 // this map is intentionally selective, only covering SVG elements that may
 // contain child elements.
 var isSVG = makeMap(
-  'svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,font,' +
+  'svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,' +
   'font-face,g,glyph,image,line,marker,mask,missing-glyph,path,pattern,' +
   'polygon,polyline,rect,switch,symbol,text,textpath,tspan,use,view',
   true

diff --git a/packages/vue-template-compiler/package.json b/packages/vue-template-compiler/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-template-compiler",
-  "version": "2.1.5",
+  "version": "2.1.6",
   "description": "template compiler for Vue 2.0",
   "main": "index.js",
   "repository": {