Skip to content

Commit 2b3e1a0

Browse files
yyx990803yyx990803
committed
build: build 2.5.1
1 parent 08a7fb5 commit 2b3e1a0

File tree

18 files changed

+1571
-1205
lines changed

18 files changed

+1571
-1205
lines changed

Diff for: ‎dist/vue.common.js

+28-14
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.0
2+
* Vue.js v2.5.1
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -1466,7 +1466,7 @@ function normalizeProps (options, vm) {
14661466
? val
14671467
: { type: val };
14681468
}
1469-
} else if (process.env.NODE_ENV !== 'production' && props) {
1469+
} else if (process.env.NODE_ENV !== 'production') {
14701470
warn(
14711471
"Invalid value for option \"props\": expected an Array or an Object, " +
14721472
"but got " + (toRawType(props)) + ".",
@@ -2095,14 +2095,16 @@ function normalizeArrayChildren (children, nestedIndex) {
20952095
lastIndex = res.length - 1;
20962096
last = res[lastIndex];
20972097
// nested
2098-
if (Array.isArray(c) && c.length > 0) {
2099-
c = normalizeArrayChildren(c, ((nestedIndex || '') + "_" + i));
2100-
// merge adjacent text nodes
2101-
if (isTextNode(c[0]) && isTextNode(last)) {
2102-
res[lastIndex] = createTextVNode(last.text + (c[0]).text);
2103-
c.shift();
2104-
}
2105-
res.push.apply(res, c);
2098+
if (Array.isArray(c)) {
2099+
if (c.length > 0) {
2100+
c = normalizeArrayChildren(c, ((nestedIndex || '') + "_" + i));
2101+
// merge adjacent text nodes
2102+
if (isTextNode(c[0]) && isTextNode(last)) {
2103+
res[lastIndex] = createTextVNode(last.text + (c[0]).text);
2104+
c.shift();
2105+
}
2106+
res.push.apply(res, c);
2107+
}
21062108
} else if (isPrimitive(c)) {
21072109
if (isTextNode(last)) {
21082110
// merge adjacent text nodes
@@ -3813,7 +3815,7 @@ function bindObjectListeners (data, value) {
38133815
for (var key in value) {
38143816
var existing = on[key];
38153817
var ours = value[key];
3816-
on[key] = existing ? [].concat(ours, existing) : ours;
3818+
on[key] = existing ? [].concat(existing, ours) : ours;
38173819
}
38183820
}
38193821
}
@@ -4897,7 +4899,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
48974899
}
48984900
});
48994901

4900-
Vue$3.version = '2.5.0';
4902+
Vue$3.version = '2.5.1';
49014903

49024904
/* */
49034905

@@ -6554,6 +6556,7 @@ var warn$1;
65546556
// in some cases, the event used has to be determined at runtime
65556557
// so we used some reserved tokens during compile.
65566558
var RANGE_TOKEN = '__r';
6559+
var CHECKBOX_RADIO_TOKEN = '__c';
65576560

65586561
function model (
65596562
el,
@@ -6717,6 +6720,13 @@ function normalizeEvents (on) {
67176720
on[event] = [].concat(on[RANGE_TOKEN], on[event] || []);
67186721
delete on[RANGE_TOKEN];
67196722
}
6723+
// This was originally intended to fix #4521 but no longer necessary
6724+
// after 2.5. Keeping it for backwards compat with generated code from < 2.4
6725+
/* istanbul ignore if */
6726+
if (isDef(on[CHECKBOX_RADIO_TOKEN])) {
6727+
on.change = [].concat(on[CHECKBOX_RADIO_TOKEN], on.change || []);
6728+
delete on[CHECKBOX_RADIO_TOKEN];
6729+
}
67206730
}
67216731

67226732
var target$1;
@@ -8075,6 +8085,10 @@ var TransitionGroup = {
80758085
children.forEach(applyTranslation);
80768086

80778087
// force reflow to put everything in position
8088+
// assign to this to avoid being removed in tree-shaking
8089+
// $flow-disable-line
8090+
this._reflow = document.body.offsetHeight;
8091+
80788092
children.forEach(function (c) {
80798093
if (c.data.moved) {
80808094
var el = c.elm;
@@ -9331,7 +9345,7 @@ function preTransformNode (el, options) {
93319345
addRawAttr(branch0, 'type', 'checkbox');
93329346
processElement(branch0, options);
93339347
branch0.processed = true; // prevent it from double-processed
9334-
branch0.if = "type==='checkbox'" + ifConditionExtra;
9348+
branch0.if = "(" + typeBinding + ")==='checkbox'" + ifConditionExtra;
93359349
addIfCondition(branch0, {
93369350
exp: branch0.if,
93379351
block: branch0
@@ -9342,7 +9356,7 @@ function preTransformNode (el, options) {
93429356
addRawAttr(branch1, 'type', 'radio');
93439357
processElement(branch1, options);
93449358
addIfCondition(branch0, {
9345-
exp: "type==='radio'" + ifConditionExtra,
9359+
exp: "(" + typeBinding + ")==='radio'" + ifConditionExtra,
93469360
block: branch1
93479361
});
93489362
// 3. other

Diff for: ‎dist/vue.esm.js

+28-14
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.0
2+
* Vue.js v2.5.1
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -1464,7 +1464,7 @@ function normalizeProps (options, vm) {
14641464
? val
14651465
: { type: val };
14661466
}
1467-
} else if (process.env.NODE_ENV !== 'production' && props) {
1467+
} else if (process.env.NODE_ENV !== 'production') {
14681468
warn(
14691469
"Invalid value for option \"props\": expected an Array or an Object, " +
14701470
"but got " + (toRawType(props)) + ".",
@@ -2093,14 +2093,16 @@ function normalizeArrayChildren (children, nestedIndex) {
20932093
lastIndex = res.length - 1;
20942094
last = res[lastIndex];
20952095
// nested
2096-
if (Array.isArray(c) && c.length > 0) {
2097-
c = normalizeArrayChildren(c, ((nestedIndex || '') + "_" + i));
2098-
// merge adjacent text nodes
2099-
if (isTextNode(c[0]) && isTextNode(last)) {
2100-
res[lastIndex] = createTextVNode(last.text + (c[0]).text);
2101-
c.shift();
2102-
}
2103-
res.push.apply(res, c);
2096+
if (Array.isArray(c)) {
2097+
if (c.length > 0) {
2098+
c = normalizeArrayChildren(c, ((nestedIndex || '') + "_" + i));
2099+
// merge adjacent text nodes
2100+
if (isTextNode(c[0]) && isTextNode(last)) {
2101+
res[lastIndex] = createTextVNode(last.text + (c[0]).text);
2102+
c.shift();
2103+
}
2104+
res.push.apply(res, c);
2105+
}
21042106
} else if (isPrimitive(c)) {
21052107
if (isTextNode(last)) {
21062108
// merge adjacent text nodes
@@ -3811,7 +3813,7 @@ function bindObjectListeners (data, value) {
38113813
for (var key in value) {
38123814
var existing = on[key];
38133815
var ours = value[key];
3814-
on[key] = existing ? [].concat(ours, existing) : ours;
3816+
on[key] = existing ? [].concat(existing, ours) : ours;
38153817
}
38163818
}
38173819
}
@@ -4895,7 +4897,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
48954897
}
48964898
});
48974899

4898-
Vue$3.version = '2.5.0';
4900+
Vue$3.version = '2.5.1';
48994901

49004902
/* */
49014903

@@ -6552,6 +6554,7 @@ var warn$1;
65526554
// in some cases, the event used has to be determined at runtime
65536555
// so we used some reserved tokens during compile.
65546556
var RANGE_TOKEN = '__r';
6557+
var CHECKBOX_RADIO_TOKEN = '__c';
65556558

65566559
function model (
65576560
el,
@@ -6715,6 +6718,13 @@ function normalizeEvents (on) {
67156718
on[event] = [].concat(on[RANGE_TOKEN], on[event] || []);
67166719
delete on[RANGE_TOKEN];
67176720
}
6721+
// This was originally intended to fix #4521 but no longer necessary
6722+
// after 2.5. Keeping it for backwards compat with generated code from < 2.4
6723+
/* istanbul ignore if */
6724+
if (isDef(on[CHECKBOX_RADIO_TOKEN])) {
6725+
on.change = [].concat(on[CHECKBOX_RADIO_TOKEN], on.change || []);
6726+
delete on[CHECKBOX_RADIO_TOKEN];
6727+
}
67186728
}
67196729

67206730
var target$1;
@@ -8073,6 +8083,10 @@ var TransitionGroup = {
80738083
children.forEach(applyTranslation);
80748084

80758085
// force reflow to put everything in position
8086+
// assign to this to avoid being removed in tree-shaking
8087+
// $flow-disable-line
8088+
this._reflow = document.body.offsetHeight;
8089+
80768090
children.forEach(function (c) {
80778091
if (c.data.moved) {
80788092
var el = c.elm;
@@ -9329,7 +9343,7 @@ function preTransformNode (el, options) {
93299343
addRawAttr(branch0, 'type', 'checkbox');
93309344
processElement(branch0, options);
93319345
branch0.processed = true; // prevent it from double-processed
9332-
branch0.if = "type==='checkbox'" + ifConditionExtra;
9346+
branch0.if = "(" + typeBinding + ")==='checkbox'" + ifConditionExtra;
93339347
addIfCondition(branch0, {
93349348
exp: branch0.if,
93359349
block: branch0
@@ -9340,7 +9354,7 @@ function preTransformNode (el, options) {
93409354
addRawAttr(branch1, 'type', 'radio');
93419355
processElement(branch1, options);
93429356
addIfCondition(branch0, {
9343-
exp: "type==='radio'" + ifConditionExtra,
9357+
exp: "(" + typeBinding + ")==='radio'" + ifConditionExtra,
93449358
block: branch1
93459359
});
93469360
// 3. other

Diff for: ‎dist/vue.js

+28-14
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.0
2+
* Vue.js v2.5.1
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -1470,7 +1470,7 @@ function normalizeProps (options, vm) {
14701470
? val
14711471
: { type: val };
14721472
}
1473-
} else if ("development" !== 'production' && props) {
1473+
} else {
14741474
warn(
14751475
"Invalid value for option \"props\": expected an Array or an Object, " +
14761476
"but got " + (toRawType(props)) + ".",
@@ -2099,14 +2099,16 @@ function normalizeArrayChildren (children, nestedIndex) {
20992099
lastIndex = res.length - 1;
21002100
last = res[lastIndex];
21012101
// nested
2102-
if (Array.isArray(c) && c.length > 0) {
2103-
c = normalizeArrayChildren(c, ((nestedIndex || '') + "_" + i));
2104-
// merge adjacent text nodes
2105-
if (isTextNode(c[0]) && isTextNode(last)) {
2106-
res[lastIndex] = createTextVNode(last.text + (c[0]).text);
2107-
c.shift();
2108-
}
2109-
res.push.apply(res, c);
2102+
if (Array.isArray(c)) {
2103+
if (c.length > 0) {
2104+
c = normalizeArrayChildren(c, ((nestedIndex || '') + "_" + i));
2105+
// merge adjacent text nodes
2106+
if (isTextNode(c[0]) && isTextNode(last)) {
2107+
res[lastIndex] = createTextVNode(last.text + (c[0]).text);
2108+
c.shift();
2109+
}
2110+
res.push.apply(res, c);
2111+
}
21102112
} else if (isPrimitive(c)) {
21112113
if (isTextNode(last)) {
21122114
// merge adjacent text nodes
@@ -3809,7 +3811,7 @@ function bindObjectListeners (data, value) {
38093811
for (var key in value) {
38103812
var existing = on[key];
38113813
var ours = value[key];
3812-
on[key] = existing ? [].concat(ours, existing) : ours;
3814+
on[key] = existing ? [].concat(existing, ours) : ours;
38133815
}
38143816
}
38153817
}
@@ -4886,7 +4888,7 @@ Object.defineProperty(Vue$3.prototype, '$ssrContext', {
48864888
}
48874889
});
48884890

4889-
Vue$3.version = '2.5.0';
4891+
Vue$3.version = '2.5.1';
48904892

48914893
/* */
48924894

@@ -6543,6 +6545,7 @@ var warn$1;
65436545
// in some cases, the event used has to be determined at runtime
65446546
// so we used some reserved tokens during compile.
65456547
var RANGE_TOKEN = '__r';
6548+
var CHECKBOX_RADIO_TOKEN = '__c';
65466549

65476550
function model (
65486551
el,
@@ -6706,6 +6709,13 @@ function normalizeEvents (on) {
67066709
on[event] = [].concat(on[RANGE_TOKEN], on[event] || []);
67076710
delete on[RANGE_TOKEN];
67086711
}
6712+
// This was originally intended to fix #4521 but no longer necessary
6713+
// after 2.5. Keeping it for backwards compat with generated code from < 2.4
6714+
/* istanbul ignore if */
6715+
if (isDef(on[CHECKBOX_RADIO_TOKEN])) {
6716+
on.change = [].concat(on[CHECKBOX_RADIO_TOKEN], on.change || []);
6717+
delete on[CHECKBOX_RADIO_TOKEN];
6718+
}
67096719
}
67106720

67116721
var target$1;
@@ -8064,6 +8074,10 @@ var TransitionGroup = {
80648074
children.forEach(applyTranslation);
80658075

80668076
// force reflow to put everything in position
8077+
// assign to this to avoid being removed in tree-shaking
8078+
// $flow-disable-line
8079+
this._reflow = document.body.offsetHeight;
8080+
80678081
children.forEach(function (c) {
80688082
if (c.data.moved) {
80698083
var el = c.elm;
@@ -9320,7 +9334,7 @@ function preTransformNode (el, options) {
93209334
addRawAttr(branch0, 'type', 'checkbox');
93219335
processElement(branch0, options);
93229336
branch0.processed = true; // prevent it from double-processed
9323-
branch0.if = "type==='checkbox'" + ifConditionExtra;
9337+
branch0.if = "(" + typeBinding + ")==='checkbox'" + ifConditionExtra;
93249338
addIfCondition(branch0, {
93259339
exp: branch0.if,
93269340
block: branch0
@@ -9331,7 +9345,7 @@ function preTransformNode (el, options) {
93319345
addRawAttr(branch1, 'type', 'radio');
93329346
processElement(branch1, options);
93339347
addIfCondition(branch0, {
9334-
exp: "type==='radio'" + ifConditionExtra,
9348+
exp: "(" + typeBinding + ")==='radio'" + ifConditionExtra,
93359349
block: branch1
93369350
});
93379351
// 3. other

Diff for: ‎dist/vue.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)