Skip to content

Commit eb81ec2

Browse files
yyx990803yyx990803
committed
build: build 2.5.18
1 parent dfaf9e2 commit eb81ec2

19 files changed

+19284
-80
lines changed

Diff for: ‎dist/vue.common.dev.js

+11,049
Large diffs are not rendered by default.

Diff for: ‎dist/vue.common.js

+19-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.18-beta.0
2+
* Vue.js v2.5.18
33
* (c) 2014-2018 Evan You
44
* Released under the MIT License.
55
*/
@@ -2728,6 +2728,14 @@ function resolveScopedSlots (
27282728
var activeInstance = null;
27292729
var isUpdatingChildComponent = false;
27302730

2731+
function setActiveInstance(vm) {
2732+
var prevActiveInstance = activeInstance;
2733+
activeInstance = vm;
2734+
return function () {
2735+
activeInstance = prevActiveInstance;
2736+
}
2737+
}
2738+
27312739
function initLifecycle (vm) {
27322740
var options = vm.$options;
27332741

@@ -2759,8 +2767,7 @@ function lifecycleMixin (Vue) {
27592767
var vm = this;
27602768
var prevEl = vm.$el;
27612769
var prevVnode = vm._vnode;
2762-
var prevActiveInstance = activeInstance;
2763-
activeInstance = vm;
2770+
var restoreActiveInstance = setActiveInstance(vm);
27642771
vm._vnode = vnode;
27652772
// Vue.prototype.__patch__ is injected in entry points
27662773
// based on the rendering backend used.
@@ -2771,7 +2778,7 @@ function lifecycleMixin (Vue) {
27712778
// updates
27722779
vm.$el = vm.__patch__(prevVnode, vnode);
27732780
}
2774-
activeInstance = prevActiveInstance;
2781+
restoreActiveInstance();
27752782
// update __vue__ reference
27762783
if (prevEl) {
27772784
prevEl.__vue__ = null;
@@ -5181,7 +5188,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
51815188
value: FunctionalRenderContext
51825189
});
51835190

5184-
Vue.version = '2.5.18-beta.0';
5191+
Vue.version = '2.5.18';
51855192

51865193
/* */
51875194

@@ -8474,6 +8481,7 @@ var TransitionGroup = {
84748481

84758482
var update = this._update;
84768483
this._update = function (vnode, hydrating) {
8484+
var restoreActiveInstance = setActiveInstance(this$1);
84778485
// force removing pass
84788486
this$1.__patch__(
84798487
this$1._vnode,
@@ -8482,6 +8490,7 @@ var TransitionGroup = {
84828490
true // removeOnly (!important, avoids unnecessary moves)
84838491
);
84848492
this$1._vnode = this$1.kept;
8493+
restoreActiveInstance();
84858494
update.call(this$1, vnode, hydrating);
84868495
};
84878496
},
@@ -10080,13 +10089,15 @@ var keyNames = {
1008010089
esc: ['Esc', 'Escape'],
1008110090
tab: 'Tab',
1008210091
enter: 'Enter',
10083-
space: ' ',
10092+
// #9112: IE11 uses `Spacebar` for Space key name.
10093+
space: [' ', 'Spacebar'],
1008410094
// #7806: IE11 uses key names without `Arrow` prefix for arrow keys.
1008510095
up: ['Up', 'ArrowUp'],
1008610096
left: ['Left', 'ArrowLeft'],
1008710097
right: ['Right', 'ArrowRight'],
1008810098
down: ['Down', 'ArrowDown'],
10089-
'delete': ['Backspace', 'Delete']
10099+
// #9112: IE11 uses `Del` for Delete key name.
10100+
'delete': ['Backspace', 'Delete', 'Del']
1009010101
};
1009110102

1009210103
// #4868: modifiers that prevent the execution of the listener
@@ -10580,9 +10591,7 @@ function genChildren (
1058010591
el$1.tag !== 'template' &&
1058110592
el$1.tag !== 'slot'
1058210593
) {
10583-
// because el may be a functional component and return an Array instead of a single root.
10584-
// In this case, just a simple normalization is needed
10585-
var normalizationType = state.maybeComponent(el$1) ? ",1" : "";
10594+
var normalizationType = checkSkip && state.maybeComponent(el$1) ? ",1" : "";
1058610595
return ("" + ((altGenElement || genElement)(el$1, state)) + normalizationType)
1058710596
}
1058810597
var normalizationType$1 = checkSkip

Diff for: ‎dist/vue.common.prod.js

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

Diff for: ‎dist/vue.esm.browser.min.js

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

Diff for: ‎dist/vue.esm.js

+19-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.18-beta.0
2+
* Vue.js v2.5.18
33
* (c) 2014-2018 Evan You
44
* Released under the MIT License.
55
*/
@@ -2726,6 +2726,14 @@ function resolveScopedSlots (
27262726
var activeInstance = null;
27272727
var isUpdatingChildComponent = false;
27282728

2729+
function setActiveInstance(vm) {
2730+
var prevActiveInstance = activeInstance;
2731+
activeInstance = vm;
2732+
return function () {
2733+
activeInstance = prevActiveInstance;
2734+
}
2735+
}
2736+
27292737
function initLifecycle (vm) {
27302738
var options = vm.$options;
27312739

@@ -2757,8 +2765,7 @@ function lifecycleMixin (Vue) {
27572765
var vm = this;
27582766
var prevEl = vm.$el;
27592767
var prevVnode = vm._vnode;
2760-
var prevActiveInstance = activeInstance;
2761-
activeInstance = vm;
2768+
var restoreActiveInstance = setActiveInstance(vm);
27622769
vm._vnode = vnode;
27632770
// Vue.prototype.__patch__ is injected in entry points
27642771
// based on the rendering backend used.
@@ -2769,7 +2776,7 @@ function lifecycleMixin (Vue) {
27692776
// updates
27702777
vm.$el = vm.__patch__(prevVnode, vnode);
27712778
}
2772-
activeInstance = prevActiveInstance;
2779+
restoreActiveInstance();
27732780
// update __vue__ reference
27742781
if (prevEl) {
27752782
prevEl.__vue__ = null;
@@ -5179,7 +5186,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
51795186
value: FunctionalRenderContext
51805187
});
51815188

5182-
Vue.version = '2.5.18-beta.0';
5189+
Vue.version = '2.5.18';
51835190

51845191
/* */
51855192

@@ -8472,6 +8479,7 @@ var TransitionGroup = {
84728479

84738480
var update = this._update;
84748481
this._update = function (vnode, hydrating) {
8482+
var restoreActiveInstance = setActiveInstance(this$1);
84758483
// force removing pass
84768484
this$1.__patch__(
84778485
this$1._vnode,
@@ -8480,6 +8488,7 @@ var TransitionGroup = {
84808488
true // removeOnly (!important, avoids unnecessary moves)
84818489
);
84828490
this$1._vnode = this$1.kept;
8491+
restoreActiveInstance();
84838492
update.call(this$1, vnode, hydrating);
84848493
};
84858494
},
@@ -10078,13 +10087,15 @@ var keyNames = {
1007810087
esc: ['Esc', 'Escape'],
1007910088
tab: 'Tab',
1008010089
enter: 'Enter',
10081-
space: ' ',
10090+
// #9112: IE11 uses `Spacebar` for Space key name.
10091+
space: [' ', 'Spacebar'],
1008210092
// #7806: IE11 uses key names without `Arrow` prefix for arrow keys.
1008310093
up: ['Up', 'ArrowUp'],
1008410094
left: ['Left', 'ArrowLeft'],
1008510095
right: ['Right', 'ArrowRight'],
1008610096
down: ['Down', 'ArrowDown'],
10087-
'delete': ['Backspace', 'Delete']
10097+
// #9112: IE11 uses `Del` for Delete key name.
10098+
'delete': ['Backspace', 'Delete', 'Del']
1008810099
};
1008910100

1009010101
// #4868: modifiers that prevent the execution of the listener
@@ -10578,9 +10589,7 @@ function genChildren (
1057810589
el$1.tag !== 'template' &&
1057910590
el$1.tag !== 'slot'
1058010591
) {
10581-
// because el may be a functional component and return an Array instead of a single root.
10582-
// In this case, just a simple normalization is needed
10583-
var normalizationType = state.maybeComponent(el$1) ? ",1" : "";
10592+
var normalizationType = checkSkip && state.maybeComponent(el$1) ? ",1" : "";
1058410593
return ("" + ((altGenElement || genElement)(el$1, state)) + normalizationType)
1058510594
}
1058610595
var normalizationType$1 = checkSkip

Diff for: ‎dist/vue.js

+19-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.5.18-beta.0
2+
* Vue.js v2.5.18
33
* (c) 2014-2018 Evan You
44
* Released under the MIT License.
55
*/
@@ -2724,6 +2724,14 @@
27242724
var activeInstance = null;
27252725
var isUpdatingChildComponent = false;
27262726

2727+
function setActiveInstance(vm) {
2728+
var prevActiveInstance = activeInstance;
2729+
activeInstance = vm;
2730+
return function () {
2731+
activeInstance = prevActiveInstance;
2732+
}
2733+
}
2734+
27272735
function initLifecycle (vm) {
27282736
var options = vm.$options;
27292737

@@ -2755,8 +2763,7 @@
27552763
var vm = this;
27562764
var prevEl = vm.$el;
27572765
var prevVnode = vm._vnode;
2758-
var prevActiveInstance = activeInstance;
2759-
activeInstance = vm;
2766+
var restoreActiveInstance = setActiveInstance(vm);
27602767
vm._vnode = vnode;
27612768
// Vue.prototype.__patch__ is injected in entry points
27622769
// based on the rendering backend used.
@@ -2767,7 +2774,7 @@
27672774
// updates
27682775
vm.$el = vm.__patch__(prevVnode, vnode);
27692776
}
2770-
activeInstance = prevActiveInstance;
2777+
restoreActiveInstance();
27712778
// update __vue__ reference
27722779
if (prevEl) {
27732780
prevEl.__vue__ = null;
@@ -5163,7 +5170,7 @@
51635170
value: FunctionalRenderContext
51645171
});
51655172

5166-
Vue.version = '2.5.18-beta.0';
5173+
Vue.version = '2.5.18';
51675174

51685175
/* */
51695176

@@ -8453,6 +8460,7 @@
84538460

84548461
var update = this._update;
84558462
this._update = function (vnode, hydrating) {
8463+
var restoreActiveInstance = setActiveInstance(this$1);
84568464
// force removing pass
84578465
this$1.__patch__(
84588466
this$1._vnode,
@@ -8461,6 +8469,7 @@
84618469
true // removeOnly (!important, avoids unnecessary moves)
84628470
);
84638471
this$1._vnode = this$1.kept;
8472+
restoreActiveInstance();
84648473
update.call(this$1, vnode, hydrating);
84658474
};
84668475
},
@@ -10052,13 +10061,15 @@
1005210061
esc: ['Esc', 'Escape'],
1005310062
tab: 'Tab',
1005410063
enter: 'Enter',
10055-
space: ' ',
10064+
// #9112: IE11 uses `Spacebar` for Space key name.
10065+
space: [' ', 'Spacebar'],
1005610066
// #7806: IE11 uses key names without `Arrow` prefix for arrow keys.
1005710067
up: ['Up', 'ArrowUp'],
1005810068
left: ['Left', 'ArrowLeft'],
1005910069
right: ['Right', 'ArrowRight'],
1006010070
down: ['Down', 'ArrowDown'],
10061-
'delete': ['Backspace', 'Delete']
10071+
// #9112: IE11 uses `Del` for Delete key name.
10072+
'delete': ['Backspace', 'Delete', 'Del']
1006210073
};
1006310074

1006410075
// #4868: modifiers that prevent the execution of the listener
@@ -10549,9 +10560,7 @@
1054910560
el$1.tag !== 'template' &&
1055010561
el$1.tag !== 'slot'
1055110562
) {
10552-
// because el may be a functional component and return an Array instead of a single root.
10553-
// In this case, just a simple normalization is needed
10554-
var normalizationType = state.maybeComponent(el$1) ? ",1" : "";
10563+
var normalizationType = checkSkip && state.maybeComponent(el$1) ? ",1" : "";
1055510564
return ("" + ((altGenElement || genElement)(el$1, state)) + normalizationType)
1055610565
}
1055710566
var normalizationType$1 = checkSkip

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)