Skip to content

Commit 06c4f2a

Browse files
yyx990803yyx990803
committed
[build] 2.1.6
1 parent 31347d1 commit 06c4f2a

File tree

11 files changed

+54
-38
lines changed

11 files changed

+54
-38
lines changed

‎dist/vue.common.js‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.1.5
2+
* Vue.js v2.1.6
33
* (c) 2014-2016 Evan You
44
* Released under the MIT License.
55
*/
@@ -2764,7 +2764,7 @@ function normalizeArrayChildren (children, nestedIndex) {
27642764
var i, c, last;
27652765
for (i = 0; i < children.length; i++) {
27662766
c = children[i];
2767-
if (c == null) { continue }
2767+
if (c == null || typeof c === 'boolean') { continue }
27682768
last = res[res.length - 1];
27692769
// nested
27702770
if (Array.isArray(c)) {
@@ -3587,7 +3587,7 @@ Object.defineProperty(Vue$3.prototype, '$isServer', {
35873587
get: isServerRendering
35883588
});
35893589

3590-
Vue$3.version = '2.1.5';
3590+
Vue$3.version = '2.1.6';
35913591

35923592
/* */
35933593

@@ -3724,7 +3724,7 @@ var isHTMLTag = makeMap(
37243724
// this map is intentionally selective, only covering SVG elements that may
37253725
// contain child elements.
37263726
var isSVG = makeMap(
3727-
'svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,font,' +
3727+
'svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,' +
37283728
'font-face,g,glyph,image,line,marker,mask,missing-glyph,path,pattern,' +
37293729
'polygon,polyline,rect,switch,symbol,text,textpath,tspan,use,view',
37303730
true
@@ -7698,14 +7698,18 @@ function genChildren (el, checkSkip) {
76987698
function canSkipNormalization (children) {
76997699
for (var i = 0; i < children.length; i++) {
77007700
var el = children[i];
7701-
if (el.for || el.tag === 'template' || el.tag === 'slot' ||
7702-
(el.if && el.ifConditions.some(function (c) { return c.tag === 'template'; }))) {
7701+
if (needsNormalization(el) ||
7702+
(el.if && el.ifConditions.some(function (c) { return needsNormalization(c.block); }))) {
77037703
return false
77047704
}
77057705
}
77067706
return true
77077707
}
77087708

7709+
function needsNormalization (el) {
7710+
return el.for || el.tag === 'template' || el.tag === 'slot'
7711+
}
7712+
77097713
function genNode (node) {
77107714
if (node.type === 1) {
77117715
return genElement(node)

‎dist/vue.js‎

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.1.5
2+
* Vue.js v2.1.6
33
* (c) 2014-2016 Evan You
44
* Released under the MIT License.
55
*/
@@ -2766,7 +2766,7 @@ function normalizeArrayChildren (children, nestedIndex) {
27662766
var i, c, last;
27672767
for (i = 0; i < children.length; i++) {
27682768
c = children[i];
2769-
if (c == null) { continue }
2769+
if (c == null || typeof c === 'boolean') { continue }
27702770
last = res[res.length - 1];
27712771
// nested
27722772
if (Array.isArray(c)) {
@@ -3587,7 +3587,7 @@ Object.defineProperty(Vue$3.prototype, '$isServer', {
35873587
get: isServerRendering
35883588
});
35893589

3590-
Vue$3.version = '2.1.5';
3590+
Vue$3.version = '2.1.6';
35913591

35923592
/* */
35933593

@@ -3724,7 +3724,7 @@ var isHTMLTag = makeMap(
37243724
// this map is intentionally selective, only covering SVG elements that may
37253725
// contain child elements.
37263726
var isSVG = makeMap(
3727-
'svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,font,' +
3727+
'svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,' +
37283728
'font-face,g,glyph,image,line,marker,mask,missing-glyph,path,pattern,' +
37293729
'polygon,polyline,rect,switch,symbol,text,textpath,tspan,use,view',
37303730
true
@@ -7698,14 +7698,18 @@ function genChildren (el, checkSkip) {
76987698
function canSkipNormalization (children) {
76997699
for (var i = 0; i < children.length; i++) {
77007700
var el = children[i];
7701-
if (el.for || el.tag === 'template' || el.tag === 'slot' ||
7702-
(el.if && el.ifConditions.some(function (c) { return c.tag === 'template'; }))) {
7701+
if (needsNormalization(el) ||
7702+
(el.if && el.ifConditions.some(function (c) { return needsNormalization(c.block); }))) {
77037703
return false
77047704
}
77057705
}
77067706
return true
77077707
}
77087708

7709+
function needsNormalization (el) {
7710+
return el.for || el.tag === 'template' || el.tag === 'slot'
7711+
}
7712+
77097713
function genNode (node) {
77107714
if (node.type === 1) {
77117715
return genElement(node)

‎dist/vue.min.js‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/vue.runtime.common.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.1.5
2+
* Vue.js v2.1.6
33
* (c) 2014-2016 Evan You
44
* Released under the MIT License.
55
*/
@@ -2764,7 +2764,7 @@ function normalizeArrayChildren (children, nestedIndex) {
27642764
var i, c, last;
27652765
for (i = 0; i < children.length; i++) {
27662766
c = children[i];
2767-
if (c == null) { continue }
2767+
if (c == null || typeof c === 'boolean') { continue }
27682768
last = res[res.length - 1];
27692769
// nested
27702770
if (Array.isArray(c)) {
@@ -3587,7 +3587,7 @@ Object.defineProperty(Vue$2.prototype, '$isServer', {
35873587
get: isServerRendering
35883588
});
35893589

3590-
Vue$2.version = '2.1.5';
3590+
Vue$2.version = '2.1.6';
35913591

35923592
/* */
35933593

@@ -3724,7 +3724,7 @@ var isHTMLTag = makeMap(
37243724
// this map is intentionally selective, only covering SVG elements that may
37253725
// contain child elements.
37263726
var isSVG = makeMap(
3727-
'svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,font,' +
3727+
'svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,' +
37283728
'font-face,g,glyph,image,line,marker,mask,missing-glyph,path,pattern,' +
37293729
'polygon,polyline,rect,switch,symbol,text,textpath,tspan,use,view',
37303730
true

‎dist/vue.runtime.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.1.5
2+
* Vue.js v2.1.6
33
* (c) 2014-2016 Evan You
44
* Released under the MIT License.
55
*/
@@ -2766,7 +2766,7 @@ function normalizeArrayChildren (children, nestedIndex) {
27662766
var i, c, last;
27672767
for (i = 0; i < children.length; i++) {
27682768
c = children[i];
2769-
if (c == null) { continue }
2769+
if (c == null || typeof c === 'boolean') { continue }
27702770
last = res[res.length - 1];
27712771
// nested
27722772
if (Array.isArray(c)) {
@@ -3587,7 +3587,7 @@ Object.defineProperty(Vue$2.prototype, '$isServer', {
35873587
get: isServerRendering
35883588
});
35893589

3590-
Vue$2.version = '2.1.5';
3590+
Vue$2.version = '2.1.6';
35913591

35923592
/* */
35933593

@@ -3724,7 +3724,7 @@ var isHTMLTag = makeMap(
37243724
// this map is intentionally selective, only covering SVG elements that may
37253725
// contain child elements.
37263726
var isSVG = makeMap(
3727-
'svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,font,' +
3727+
'svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,' +
37283728
'font-face,g,glyph,image,line,marker,mask,missing-glyph,path,pattern,' +
37293729
'polygon,polyline,rect,switch,symbol,text,textpath,tspan,use,view',
37303730
true

‎dist/vue.runtime.min.js‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/svg/index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<title>Vue.js SVG graph example</title>
66
<link rel="stylesheet" href="style.css">
77
<!-- Delete ".min" for console warnings in development -->
8-
<script src="../../dist/vue.min.js"></script>
8+
<script src="../../dist/vue.js"></script>
99
</head>
1010
<body>
1111

‎packages/vue-server-renderer/build.js‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2308,14 +2308,18 @@ function genChildren (el, checkSkip) {
23082308
function canSkipNormalization (children) {
23092309
for (var i = 0; i < children.length; i++) {
23102310
var el = children[i];
2311-
if (el.for || el.tag === 'template' || el.tag === 'slot' ||
2312-
(el.if && el.ifConditions.some(function (c) { return c.tag === 'template'; }))) {
2311+
if (needsNormalization(el) ||
2312+
(el.if && el.ifConditions.some(function (c) { return needsNormalization(c.block); }))) {
23132313
return false
23142314
}
23152315
}
23162316
return true
23172317
}
23182318

2319+
function needsNormalization (el) {
2320+
return el.for || el.tag === 'template' || el.tag === 'slot'
2321+
}
2322+
23192323
function genNode (node) {
23202324
if (node.type === 1) {
23212325
return genElement(node)
@@ -4532,7 +4536,7 @@ function normalizeArrayChildren (children, nestedIndex) {
45324536
var i, c, last;
45334537
for (i = 0; i < children.length; i++) {
45344538
c = children[i];
4535-
if (c == null) { continue }
4539+
if (c == null || typeof c === 'boolean') { continue }
45364540
last = res[res.length - 1];
45374541
// nested
45384542
if (Array.isArray(c)) {
@@ -5734,7 +5738,7 @@ var isHTMLTag = makeMap(
57345738
// this map is intentionally selective, only covering SVG elements that may
57355739
// contain child elements.
57365740
var isSVG = makeMap(
5737-
'svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,font,' +
5741+
'svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,' +
57385742
'font-face,g,glyph,image,line,marker,mask,missing-glyph,path,pattern,' +
57395743
'polygon,polyline,rect,switch,symbol,text,textpath,tspan,use,view',
57405744
true

‎packages/vue-server-renderer/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-server-renderer",
3-
"version": "2.1.5",
3+
"version": "2.1.6",
44
"description": "server renderer for Vue 2.0",
55
"main": "index.js",
66
"repository": {

‎packages/vue-template-compiler/build.js‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2183,14 +2183,18 @@ function genChildren (el, checkSkip) {
21832183
function canSkipNormalization (children) {
21842184
for (var i = 0; i < children.length; i++) {
21852185
var el = children[i];
2186-
if (el.for || el.tag === 'template' || el.tag === 'slot' ||
2187-
(el.if && el.ifConditions.some(function (c) { return c.tag === 'template'; }))) {
2186+
if (needsNormalization(el) ||
2187+
(el.if && el.ifConditions.some(function (c) { return needsNormalization(c.block); }))) {
21882188
return false
21892189
}
21902190
}
21912191
return true
21922192
}
21932193

2194+
function needsNormalization (el) {
2195+
return el.for || el.tag === 'template' || el.tag === 'slot'
2196+
}
2197+
21942198
function genNode (node) {
21952199
if (node.type === 1) {
21962200
return genElement(node)
@@ -4381,7 +4385,7 @@ function normalizeArrayChildren (children, nestedIndex) {
43814385
var i, c, last;
43824386
for (i = 0; i < children.length; i++) {
43834387
c = children[i];
4384-
if (c == null) { continue }
4388+
if (c == null || typeof c === 'boolean') { continue }
43854389
last = res[res.length - 1];
43864390
// nested
43874391
if (Array.isArray(c)) {
@@ -5557,7 +5561,7 @@ var isHTMLTag = makeMap(
55575561
// this map is intentionally selective, only covering SVG elements that may
55585562
// contain child elements.
55595563
var isSVG = makeMap(
5560-
'svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,font,' +
5564+
'svg,animate,circle,clippath,cursor,defs,desc,ellipse,filter,' +
55615565
'font-face,g,glyph,image,line,marker,mask,missing-glyph,path,pattern,' +
55625566
'polygon,polyline,rect,switch,symbol,text,textpath,tspan,use,view',
55635567
true

0 commit comments

Comments
 (0)