Skip to content

Commit ea89dd6

Browse files
committed
update to 2.5.1
1 parent 8914211 commit ea89dd6

File tree

4 files changed

+36
-22
lines changed

4 files changed

+36
-22
lines changed

src/v2/guide/installation.md

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
title: Installation
33
type: guide
44
order: 1
5-
vue_version: 2.5.0
6-
dev_size: "270.61"
7-
min_size: "83.02"
8-
gz_size: "30.28"
9-
ro_gz_size: "21.00"
5+
vue_version: 2.5.1
6+
dev_size: "271.12"
7+
min_size: "83.13"
8+
gz_size: "30.33"
9+
ro_gz_size: "21.04"
1010
---
1111

1212
### Compatibility Note

themes/vue/_config.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
site_description: "Vue.js - The Progressive JavaScript Framework"
22
google_analytics: UA-46852172-1
33
root_domain: vuejs.org
4-
vue_version: 2.5.0
4+
vue_version: 2.5.1

themes/vue/source/js/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

themes/vue/source/js/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)