Skip to content

Commit 82474b5

Browse files
yyx990803yyx990803
committed
[build] 2.2.0-beta.2
1 parent 6468e15 commit 82474b5

File tree

13 files changed

+8763
-12964
lines changed

13 files changed

+8763
-12964
lines changed

‎dist/vue.common.js

Lines changed: 293 additions & 224 deletions
Large diffs are not rendered by default.

‎dist/vue.js

Lines changed: 293 additions & 224 deletions
Large diffs are not rendered by default.

‎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: 62 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.2.0-beta.1
2+
* Vue.js v2.2.0-beta.2
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -546,6 +546,7 @@ function parsePath (path) {
546546
}
547547

548548
var warn = noop;
549+
var tip = noop;
549550
var formatComponentName;
550551

551552
if (process.env.NODE_ENV !== 'production') {
@@ -563,6 +564,14 @@ if (process.env.NODE_ENV !== 'production') {
563564
}
564565
};
565566

567+
tip = function (msg, vm) {
568+
if (hasConsole && (!config.silent)) {
569+
console.warn("[Vue tip]: " + msg + " " + (
570+
vm ? formatLocation(formatComponentName(vm)) : ''
571+
));
572+
}
573+
};
574+
566575
formatComponentName = function (vm, includeFile) {
567576
if (vm.$root === vm) {
568577
return '<Root>'
@@ -1489,6 +1498,7 @@ var util = Object.freeze({
14891498
mergeOptions: mergeOptions,
14901499
resolveAsset: resolveAsset,
14911500
get warn () { return warn; },
1501+
get tip () { return tip; },
14921502
get formatComponentName () { return formatComponentName; },
14931503
validateProp: validateProp,
14941504
handleError: handleError
@@ -1570,47 +1580,6 @@ if (process.env.NODE_ENV !== 'production') {
15701580

15711581
/* */
15721582

1573-
var ref = {
1574-
create: registerRef,
1575-
update: registerRef
1576-
};
1577-
1578-
function registerRef (_, vnode) {
1579-
var key = vnode.data.ref;
1580-
if (!key) { return }
1581-
1582-
var ref = vnode.componentInstance || vnode.elm;
1583-
var refs = vnode.context.$refs;
1584-
1585-
if (typeof key === 'function') {
1586-
key(ref);
1587-
} else if (vnode.data.refInFor) {
1588-
var refArray = refs[key];
1589-
if (Array.isArray(refArray)) {
1590-
if (refArray.indexOf(ref) < 0) {
1591-
refArray.push(ref);
1592-
}
1593-
} else {
1594-
refs[key] = [ref];
1595-
}
1596-
} else {
1597-
refs[key] = ref;
1598-
}
1599-
}
1600-
1601-
function resetRefs (refs) {
1602-
var res = {};
1603-
// keep existing v-for ref arrays even if empty
1604-
for (var key in refs) {
1605-
if (Array.isArray(refs[key])) {
1606-
res[key] = [];
1607-
}
1608-
}
1609-
return res
1610-
}
1611-
1612-
/* */
1613-
16141583
var VNode = function VNode (
16151584
tag,
16161585
data,
@@ -2063,7 +2032,6 @@ function lifecycleMixin (Vue) {
20632032
var prevVnode = vm._vnode;
20642033
var prevActiveInstance = activeInstance;
20652034
activeInstance = vm;
2066-
vm.$refs = resetRefs(vm.$refs);
20672035
vm._vnode = vnode;
20682036
// Vue.prototype.__patch__ is injected in entry points
20692037
// based on the rendering backend used.
@@ -4128,7 +4096,7 @@ Object.defineProperty(Vue$2.prototype, '$isServer', {
41284096
get: isServerRendering
41294097
});
41304098

4131-
Vue$2.version = '2.2.0-beta.1';
4099+
Vue$2.version = '2.2.0-beta.2';
41324100

41334101
/* */
41344102

@@ -4407,6 +4375,49 @@ var nodeOps = Object.freeze({
44074375
setAttribute: setAttribute
44084376
});
44094377

4378+
/* */
4379+
4380+
var ref = {
4381+
create: function create (_, vnode) {
4382+
registerRef(vnode);
4383+
},
4384+
update: function update (oldVnode, vnode) {
4385+
if (oldVnode.data.ref !== vnode.data.ref) {
4386+
registerRef(oldVnode, true);
4387+
registerRef(vnode);
4388+
}
4389+
},
4390+
destroy: function destroy (vnode) {
4391+
registerRef(vnode, true);
4392+
}
4393+
};
4394+
4395+
function registerRef (vnode, isRemoval) {
4396+
var key = vnode.data.ref;
4397+
if (!key) { return }
4398+
4399+
var vm = vnode.context;
4400+
var ref = vnode.componentInstance || vnode.elm;
4401+
var refs = vm.$refs;
4402+
if (isRemoval) {
4403+
if (Array.isArray(refs[key])) {
4404+
remove(refs[key], ref);
4405+
} else if (refs[key] === ref) {
4406+
refs[key] = undefined;
4407+
}
4408+
} else {
4409+
if (vnode.data.refInFor) {
4410+
if (Array.isArray(refs[key]) && refs[key].indexOf(ref) < 0) {
4411+
refs[key].push(ref);
4412+
} else {
4413+
refs[key] = [ref];
4414+
}
4415+
} else {
4416+
refs[key] = ref;
4417+
}
4418+
}
4419+
}
4420+
44104421
/**
44114422
* Virtual DOM patching algorithm based on Snabbdom by
44124423
* Simon Friis Vindum (@paldepind)
@@ -4575,7 +4586,7 @@ function createPatchFunction (backend) {
45754586
} else {
45764587
// empty component root.
45774588
// skip all element-related modules except for ref (#3455)
4578-
registerRef(null, vnode);
4589+
registerRef(vnode);
45794590
// make sure to invoke the insert hook
45804591
insertedVnodeQueue.push(vnode);
45814592
}
@@ -5663,14 +5674,11 @@ function resolveTransition (def$$1) {
56635674
var autoCssTransition = cached(function (name) {
56645675
return {
56655676
enterClass: (name + "-enter"),
5666-
leaveClass: (name + "-leave"),
5667-
appearClass: (name + "-enter"),
56685677
enterToClass: (name + "-enter-to"),
5669-
leaveToClass: (name + "-leave-to"),
5670-
appearToClass: (name + "-enter-to"),
56715678
enterActiveClass: (name + "-enter-active"),
5672-
leaveActiveClass: (name + "-leave-active"),
5673-
appearActiveClass: (name + "-enter-active")
5679+
leaveClass: (name + "-leave"),
5680+
leaveToClass: (name + "-leave-to"),
5681+
leaveActiveClass: (name + "-leave-active")
56745682
}
56755683
});
56765684

@@ -5873,9 +5881,9 @@ function enter (vnode, toggleDisplay) {
58735881
return
58745882
}
58755883

5876-
var startClass = isAppear ? appearClass : enterClass;
5877-
var activeClass = isAppear ? appearActiveClass : enterActiveClass;
5878-
var toClass = isAppear ? appearToClass : enterToClass;
5884+
var startClass = isAppear && appearClass ? appearClass : enterClass;
5885+
var activeClass = isAppear && appearActiveClass ? appearActiveClass : enterActiveClass;
5886+
var toClass = isAppear && appearToClass ? appearToClass : enterToClass;
58795887

58805888
var beforeEnterHook = isAppear ? (beforeAppear || beforeEnter) : beforeEnter;
58815889
var enterHook = isAppear ? (typeof appear === 'function' ? appear : enter) : enter;

‎dist/vue.runtime.js

Lines changed: 62 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.2.0-beta.1
2+
* Vue.js v2.2.0-beta.2
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -550,6 +550,7 @@ function parsePath (path) {
550550
}
551551

552552
var warn = noop;
553+
var tip = noop;
553554
var formatComponentName;
554555

555556
{
@@ -567,6 +568,14 @@ var formatComponentName;
567568
}
568569
};
569570

571+
tip = function (msg, vm) {
572+
if (hasConsole && (!config.silent)) {
573+
console.warn("[Vue tip]: " + msg + " " + (
574+
vm ? formatLocation(formatComponentName(vm)) : ''
575+
));
576+
}
577+
};
578+
570579
formatComponentName = function (vm, includeFile) {
571580
if (vm.$root === vm) {
572581
return '<Root>'
@@ -1493,6 +1502,7 @@ var util = Object.freeze({
14931502
mergeOptions: mergeOptions,
14941503
resolveAsset: resolveAsset,
14951504
get warn () { return warn; },
1505+
get tip () { return tip; },
14961506
get formatComponentName () { return formatComponentName; },
14971507
validateProp: validateProp,
14981508
handleError: handleError
@@ -1574,47 +1584,6 @@ var initProxy;
15741584

15751585
/* */
15761586

1577-
var ref = {
1578-
create: registerRef,
1579-
update: registerRef
1580-
};
1581-
1582-
function registerRef (_, vnode) {
1583-
var key = vnode.data.ref;
1584-
if (!key) { return }
1585-
1586-
var ref = vnode.componentInstance || vnode.elm;
1587-
var refs = vnode.context.$refs;
1588-
1589-
if (typeof key === 'function') {
1590-
key(ref);
1591-
} else if (vnode.data.refInFor) {
1592-
var refArray = refs[key];
1593-
if (Array.isArray(refArray)) {
1594-
if (refArray.indexOf(ref) < 0) {
1595-
refArray.push(ref);
1596-
}
1597-
} else {
1598-
refs[key] = [ref];
1599-
}
1600-
} else {
1601-
refs[key] = ref;
1602-
}
1603-
}
1604-
1605-
function resetRefs (refs) {
1606-
var res = {};
1607-
// keep existing v-for ref arrays even if empty
1608-
for (var key in refs) {
1609-
if (Array.isArray(refs[key])) {
1610-
res[key] = [];
1611-
}
1612-
}
1613-
return res
1614-
}
1615-
1616-
/* */
1617-
16181587
var VNode = function VNode (
16191588
tag,
16201589
data,
@@ -2067,7 +2036,6 @@ function lifecycleMixin (Vue) {
20672036
var prevVnode = vm._vnode;
20682037
var prevActiveInstance = activeInstance;
20692038
activeInstance = vm;
2070-
vm.$refs = resetRefs(vm.$refs);
20712039
vm._vnode = vnode;
20722040
// Vue.prototype.__patch__ is injected in entry points
20732041
// based on the rendering backend used.
@@ -4124,7 +4092,7 @@ Object.defineProperty(Vue$2.prototype, '$isServer', {
41244092
get: isServerRendering
41254093
});
41264094

4127-
Vue$2.version = '2.2.0-beta.1';
4095+
Vue$2.version = '2.2.0-beta.2';
41284096

41294097
/* */
41304098

@@ -4403,6 +4371,49 @@ var nodeOps = Object.freeze({
44034371
setAttribute: setAttribute
44044372
});
44054373

4374+
/* */
4375+
4376+
var ref = {
4377+
create: function create (_, vnode) {
4378+
registerRef(vnode);
4379+
},
4380+
update: function update (oldVnode, vnode) {
4381+
if (oldVnode.data.ref !== vnode.data.ref) {
4382+
registerRef(oldVnode, true);
4383+
registerRef(vnode);
4384+
}
4385+
},
4386+
destroy: function destroy (vnode) {
4387+
registerRef(vnode, true);
4388+
}
4389+
};
4390+
4391+
function registerRef (vnode, isRemoval) {
4392+
var key = vnode.data.ref;
4393+
if (!key) { return }
4394+
4395+
var vm = vnode.context;
4396+
var ref = vnode.componentInstance || vnode.elm;
4397+
var refs = vm.$refs;
4398+
if (isRemoval) {
4399+
if (Array.isArray(refs[key])) {
4400+
remove(refs[key], ref);
4401+
} else if (refs[key] === ref) {
4402+
refs[key] = undefined;
4403+
}
4404+
} else {
4405+
if (vnode.data.refInFor) {
4406+
if (Array.isArray(refs[key]) && refs[key].indexOf(ref) < 0) {
4407+
refs[key].push(ref);
4408+
} else {
4409+
refs[key] = [ref];
4410+
}
4411+
} else {
4412+
refs[key] = ref;
4413+
}
4414+
}
4415+
}
4416+
44064417
/**
44074418
* Virtual DOM patching algorithm based on Snabbdom by
44084419
* Simon Friis Vindum (@paldepind)
@@ -4571,7 +4582,7 @@ function createPatchFunction (backend) {
45714582
} else {
45724583
// empty component root.
45734584
// skip all element-related modules except for ref (#3455)
4574-
registerRef(null, vnode);
4585+
registerRef(vnode);
45754586
// make sure to invoke the insert hook
45764587
insertedVnodeQueue.push(vnode);
45774588
}
@@ -5659,14 +5670,11 @@ function resolveTransition (def$$1) {
56595670
var autoCssTransition = cached(function (name) {
56605671
return {
56615672
enterClass: (name + "-enter"),
5662-
leaveClass: (name + "-leave"),
5663-
appearClass: (name + "-enter"),
56645673
enterToClass: (name + "-enter-to"),
5665-
leaveToClass: (name + "-leave-to"),
5666-
appearToClass: (name + "-enter-to"),
56675674
enterActiveClass: (name + "-enter-active"),
5668-
leaveActiveClass: (name + "-leave-active"),
5669-
appearActiveClass: (name + "-enter-active")
5675+
leaveClass: (name + "-leave"),
5676+
leaveToClass: (name + "-leave-to"),
5677+
leaveActiveClass: (name + "-leave-active")
56705678
}
56715679
});
56725680

@@ -5869,9 +5877,9 @@ function enter (vnode, toggleDisplay) {
58695877
return
58705878
}
58715879

5872-
var startClass = isAppear ? appearClass : enterClass;
5873-
var activeClass = isAppear ? appearActiveClass : enterActiveClass;
5874-
var toClass = isAppear ? appearToClass : enterToClass;
5880+
var startClass = isAppear && appearClass ? appearClass : enterClass;
5881+
var activeClass = isAppear && appearActiveClass ? appearActiveClass : enterActiveClass;
5882+
var toClass = isAppear && appearToClass ? appearToClass : enterToClass;
58755883

58765884
var beforeEnterHook = isAppear ? (beforeAppear || beforeEnter) : beforeEnter;
58775885
var enterHook = isAppear ? (typeof appear === 'function' ? appear : enter) : enter;

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