Skip to content

Commit 4ee9258

Browse files
yyx990803yyx990803
committed
[build] 2.1.1
1 parent fce3f04 commit 4ee9258

File tree

12 files changed

+290
-170
lines changed

12 files changed

+290
-170
lines changed

‎dist/vue.common.js

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.1.0
2+
* Vue.js v2.1.1
33
* (c) 2014-2016 Evan You
44
* Released under the MIT License.
55
*/
@@ -1421,6 +1421,15 @@ if (process.env.NODE_ENV !== 'production') {
14211421
'require' // for Webpack/Browserify
14221422
);
14231423

1424+
var warnNonPresent = function (target, key) {
1425+
warn(
1426+
"Property or method \"" + key + "\" is not defined on the instance but " +
1427+
"referenced during render. Make sure to declare reactive data " +
1428+
"properties in the data option.",
1429+
target
1430+
);
1431+
};
1432+
14241433
hasProxy =
14251434
typeof Proxy !== 'undefined' &&
14261435
Proxy.toString().match(/native code/);
@@ -1430,14 +1439,16 @@ if (process.env.NODE_ENV !== 'production') {
14301439
var has = key in target;
14311440
var isAllowed = allowedGlobals(key) || key.charAt(0) === '_';
14321441
if (!has && !isAllowed) {
1433-
warn(
1434-
"Property or method \"" + key + "\" is not defined on the instance but " +
1435-
"referenced during render. Make sure to declare reactive data " +
1436-
"properties in the data option.",
1437-
target
1438-
);
1442+
warnNonPresent(target, key);
14391443
}
14401444
return has || !isAllowed
1445+
},
1446+
1447+
get: function get (target, key) {
1448+
if (typeof key === 'string' && !(key in target)) {
1449+
warnNonPresent(target, key);
1450+
}
1451+
return target[key]
14411452
}
14421453
};
14431454

@@ -2351,6 +2362,10 @@ function lifecycleMixin (Vue) {
23512362
var vm = this;
23522363
var hasChildren = !!(vm.$options._renderChildren || renderChildren);
23532364
vm.$options._parentVnode = parentVnode;
2365+
vm.$vnode = parentVnode; // update vm's placeholder node without re-render
2366+
if (vm._vnode) { // update child tree's parent
2367+
vm._vnode.parent = parentVnode;
2368+
}
23542369
vm.$options._renderChildren = renderChildren;
23552370
// update props
23562371
if (propsData && vm.$options.props) {
@@ -3495,7 +3510,7 @@ Object.defineProperty(Vue$3.prototype, '$isServer', {
34953510
get: isServerRendering
34963511
});
34973512

3498-
Vue$3.version = '2.1.0';
3513+
Vue$3.version = '2.1.1';
34993514

35003515
/* */
35013516

@@ -4201,6 +4216,7 @@ function createPatchFunction (backend) {
42014216
vnode.key === oldVnode.key &&
42024217
(vnode.isCloned || vnode.isOnce)) {
42034218
vnode.elm = oldVnode.elm;
4219+
vnode.child = oldVnode.child;
42044220
return
42054221
}
42064222
var i;
@@ -4365,9 +4381,13 @@ function createPatchFunction (backend) {
43654381
createElm(vnode, insertedVnodeQueue);
43664382

43674383
// component root element replaced.
4368-
// update parent placeholder node element.
4384+
// update parent placeholder node element, recursively
43694385
if (vnode.parent) {
4370-
vnode.parent.elm = vnode.elm;
4386+
var ancestor = vnode.parent;
4387+
while (ancestor) {
4388+
ancestor.elm = vnode.elm;
4389+
ancestor = ancestor.parent;
4390+
}
43714391
if (isPatchable(vnode)) {
43724392
for (var i = 0; i < cbs.create.length; ++i) {
43734393
cbs.create[i](emptyNode, vnode.parent);
@@ -5900,9 +5920,9 @@ var isSpecialTag = function (tag, isSFC, stack) {
59005920
if (isScriptOrStyle(tag)) {
59015921
return true
59025922
}
5903-
if (isSFC) {
5923+
if (isSFC && stack.length === 1) {
59045924
// top-level template that has no pre-processor
5905-
if (tag === 'template' && stack.length === 1 && !stack[0].attrs.some(hasLang)) {
5925+
if (tag === 'template' && !stack[0].attrs.some(hasLang)) {
59065926
return false
59075927
} else {
59085928
return true

‎dist/vue.js

Lines changed: 32 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.1.0
2+
* Vue.js v2.1.1
33
* (c) 2014-2016 Evan You
44
* Released under the MIT License.
55
*/
@@ -1425,6 +1425,15 @@ var initProxy;
14251425
'require' // for Webpack/Browserify
14261426
);
14271427

1428+
var warnNonPresent = function (target, key) {
1429+
warn(
1430+
"Property or method \"" + key + "\" is not defined on the instance but " +
1431+
"referenced during render. Make sure to declare reactive data " +
1432+
"properties in the data option.",
1433+
target
1434+
);
1435+
};
1436+
14281437
hasProxy =
14291438
typeof Proxy !== 'undefined' &&
14301439
Proxy.toString().match(/native code/);
@@ -1434,14 +1443,16 @@ var initProxy;
14341443
var has = key in target;
14351444
var isAllowed = allowedGlobals(key) || key.charAt(0) === '_';
14361445
if (!has && !isAllowed) {
1437-
warn(
1438-
"Property or method \"" + key + "\" is not defined on the instance but " +
1439-
"referenced during render. Make sure to declare reactive data " +
1440-
"properties in the data option.",
1441-
target
1442-
);
1446+
warnNonPresent(target, key);
14431447
}
14441448
return has || !isAllowed
1449+
},
1450+
1451+
get: function get (target, key) {
1452+
if (typeof key === 'string' && !(key in target)) {
1453+
warnNonPresent(target, key);
1454+
}
1455+
return target[key]
14451456
}
14461457
};
14471458

@@ -2353,6 +2364,10 @@ function lifecycleMixin (Vue) {
23532364
var vm = this;
23542365
var hasChildren = !!(vm.$options._renderChildren || renderChildren);
23552366
vm.$options._parentVnode = parentVnode;
2367+
vm.$vnode = parentVnode; // update vm's placeholder node without re-render
2368+
if (vm._vnode) { // update child tree's parent
2369+
vm._vnode.parent = parentVnode;
2370+
}
23562371
vm.$options._renderChildren = renderChildren;
23572372
// update props
23582373
if (propsData && vm.$options.props) {
@@ -3495,7 +3510,7 @@ Object.defineProperty(Vue$3.prototype, '$isServer', {
34953510
get: isServerRendering
34963511
});
34973512

3498-
Vue$3.version = '2.1.0';
3513+
Vue$3.version = '2.1.1';
34993514

35003515
/* */
35013516

@@ -4201,6 +4216,7 @@ function createPatchFunction (backend) {
42014216
vnode.key === oldVnode.key &&
42024217
(vnode.isCloned || vnode.isOnce)) {
42034218
vnode.elm = oldVnode.elm;
4219+
vnode.child = oldVnode.child;
42044220
return
42054221
}
42064222
var i;
@@ -4365,9 +4381,13 @@ function createPatchFunction (backend) {
43654381
createElm(vnode, insertedVnodeQueue);
43664382

43674383
// component root element replaced.
4368-
// update parent placeholder node element.
4384+
// update parent placeholder node element, recursively
43694385
if (vnode.parent) {
4370-
vnode.parent.elm = vnode.elm;
4386+
var ancestor = vnode.parent;
4387+
while (ancestor) {
4388+
ancestor.elm = vnode.elm;
4389+
ancestor = ancestor.parent;
4390+
}
43714391
if (isPatchable(vnode)) {
43724392
for (var i = 0; i < cbs.create.length; ++i) {
43734393
cbs.create[i](emptyNode, vnode.parent);
@@ -5900,9 +5920,9 @@ var isSpecialTag = function (tag, isSFC, stack) {
59005920
if (isScriptOrStyle(tag)) {
59015921
return true
59025922
}
5903-
if (isSFC) {
5923+
if (isSFC && stack.length === 1) {
59045924
// top-level template that has no pre-processor
5905-
if (tag === 'template' && stack.length === 1 && !stack[0].attrs.some(hasLang)) {
5925+
if (tag === 'template' && !stack[0].attrs.some(hasLang)) {
59065926
return false
59075927
} else {
59085928
return true

‎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: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.1.0
2+
* Vue.js v2.1.1
33
* (c) 2014-2016 Evan You
44
* Released under the MIT License.
55
*/
@@ -1421,6 +1421,15 @@ if (process.env.NODE_ENV !== 'production') {
14211421
'require' // for Webpack/Browserify
14221422
);
14231423

1424+
var warnNonPresent = function (target, key) {
1425+
warn(
1426+
"Property or method \"" + key + "\" is not defined on the instance but " +
1427+
"referenced during render. Make sure to declare reactive data " +
1428+
"properties in the data option.",
1429+
target
1430+
);
1431+
};
1432+
14241433
hasProxy =
14251434
typeof Proxy !== 'undefined' &&
14261435
Proxy.toString().match(/native code/);
@@ -1430,14 +1439,16 @@ if (process.env.NODE_ENV !== 'production') {
14301439
var has = key in target;
14311440
var isAllowed = allowedGlobals(key) || key.charAt(0) === '_';
14321441
if (!has && !isAllowed) {
1433-
warn(
1434-
"Property or method \"" + key + "\" is not defined on the instance but " +
1435-
"referenced during render. Make sure to declare reactive data " +
1436-
"properties in the data option.",
1437-
target
1438-
);
1442+
warnNonPresent(target, key);
14391443
}
14401444
return has || !isAllowed
1445+
},
1446+
1447+
get: function get (target, key) {
1448+
if (typeof key === 'string' && !(key in target)) {
1449+
warnNonPresent(target, key);
1450+
}
1451+
return target[key]
14411452
}
14421453
};
14431454

@@ -2351,6 +2362,10 @@ function lifecycleMixin (Vue) {
23512362
var vm = this;
23522363
var hasChildren = !!(vm.$options._renderChildren || renderChildren);
23532364
vm.$options._parentVnode = parentVnode;
2365+
vm.$vnode = parentVnode; // update vm's placeholder node without re-render
2366+
if (vm._vnode) { // update child tree's parent
2367+
vm._vnode.parent = parentVnode;
2368+
}
23542369
vm.$options._renderChildren = renderChildren;
23552370
// update props
23562371
if (propsData && vm.$options.props) {
@@ -3495,7 +3510,7 @@ Object.defineProperty(Vue$2.prototype, '$isServer', {
34953510
get: isServerRendering
34963511
});
34973512

3498-
Vue$2.version = '2.1.0';
3513+
Vue$2.version = '2.1.1';
34993514

35003515
/* */
35013516

@@ -4201,6 +4216,7 @@ function createPatchFunction (backend) {
42014216
vnode.key === oldVnode.key &&
42024217
(vnode.isCloned || vnode.isOnce)) {
42034218
vnode.elm = oldVnode.elm;
4219+
vnode.child = oldVnode.child;
42044220
return
42054221
}
42064222
var i;
@@ -4365,9 +4381,13 @@ function createPatchFunction (backend) {
43654381
createElm(vnode, insertedVnodeQueue);
43664382

43674383
// component root element replaced.
4368-
// update parent placeholder node element.
4384+
// update parent placeholder node element, recursively
43694385
if (vnode.parent) {
4370-
vnode.parent.elm = vnode.elm;
4386+
var ancestor = vnode.parent;
4387+
while (ancestor) {
4388+
ancestor.elm = vnode.elm;
4389+
ancestor = ancestor.parent;
4390+
}
43714391
if (isPatchable(vnode)) {
43724392
for (var i = 0; i < cbs.create.length; ++i) {
43734393
cbs.create[i](emptyNode, vnode.parent);

‎dist/vue.runtime.js

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.1.0
2+
* Vue.js v2.1.1
33
* (c) 2014-2016 Evan You
44
* Released under the MIT License.
55
*/
@@ -1425,6 +1425,15 @@ var initProxy;
14251425
'require' // for Webpack/Browserify
14261426
);
14271427

1428+
var warnNonPresent = function (target, key) {
1429+
warn(
1430+
"Property or method \"" + key + "\" is not defined on the instance but " +
1431+
"referenced during render. Make sure to declare reactive data " +
1432+
"properties in the data option.",
1433+
target
1434+
);
1435+
};
1436+
14281437
hasProxy =
14291438
typeof Proxy !== 'undefined' &&
14301439
Proxy.toString().match(/native code/);
@@ -1434,14 +1443,16 @@ var initProxy;
14341443
var has = key in target;
14351444
var isAllowed = allowedGlobals(key) || key.charAt(0) === '_';
14361445
if (!has && !isAllowed) {
1437-
warn(
1438-
"Property or method \"" + key + "\" is not defined on the instance but " +
1439-
"referenced during render. Make sure to declare reactive data " +
1440-
"properties in the data option.",
1441-
target
1442-
);
1446+
warnNonPresent(target, key);
14431447
}
14441448
return has || !isAllowed
1449+
},
1450+
1451+
get: function get (target, key) {
1452+
if (typeof key === 'string' && !(key in target)) {
1453+
warnNonPresent(target, key);
1454+
}
1455+
return target[key]
14451456
}
14461457
};
14471458

@@ -2353,6 +2364,10 @@ function lifecycleMixin (Vue) {
23532364
var vm = this;
23542365
var hasChildren = !!(vm.$options._renderChildren || renderChildren);
23552366
vm.$options._parentVnode = parentVnode;
2367+
vm.$vnode = parentVnode; // update vm's placeholder node without re-render
2368+
if (vm._vnode) { // update child tree's parent
2369+
vm._vnode.parent = parentVnode;
2370+
}
23562371
vm.$options._renderChildren = renderChildren;
23572372
// update props
23582373
if (propsData && vm.$options.props) {
@@ -3495,7 +3510,7 @@ Object.defineProperty(Vue$2.prototype, '$isServer', {
34953510
get: isServerRendering
34963511
});
34973512

3498-
Vue$2.version = '2.1.0';
3513+
Vue$2.version = '2.1.1';
34993514

35003515
/* */
35013516

@@ -4201,6 +4216,7 @@ function createPatchFunction (backend) {
42014216
vnode.key === oldVnode.key &&
42024217
(vnode.isCloned || vnode.isOnce)) {
42034218
vnode.elm = oldVnode.elm;
4219+
vnode.child = oldVnode.child;
42044220
return
42054221
}
42064222
var i;
@@ -4365,9 +4381,13 @@ function createPatchFunction (backend) {
43654381
createElm(vnode, insertedVnodeQueue);
43664382

43674383
// component root element replaced.
4368-
// update parent placeholder node element.
4384+
// update parent placeholder node element, recursively
43694385
if (vnode.parent) {
4370-
vnode.parent.elm = vnode.elm;
4386+
var ancestor = vnode.parent;
4387+
while (ancestor) {
4388+
ancestor.elm = vnode.elm;
4389+
ancestor = ancestor.parent;
4390+
}
43714391
if (isPatchable(vnode)) {
43724392
for (var i = 0; i < cbs.create.length; ++i) {
43734393
cbs.create[i](emptyNode, vnode.parent);

‎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.

0 commit comments

Comments
 (0)