Skip to content

Commit 2355318

Browse files
yyx990803yyx990803
committed
[build] 2.3.1
1 parent ebd0338 commit 2355318

14 files changed

+370
-316
lines changed

‎dist/vue.common.js

Lines changed: 50 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v2.3.0
2+
* Vue.js v2.3.1
33
* (c) 2014-2017 Evan You
44
* Released under the MIT License.
55
*/
@@ -37,24 +37,24 @@ function isObject (obj) {
3737
return obj !== null && typeof obj === 'object'
3838
}
3939

40-
var toString = Object.prototype.toString;
40+
var _toString = Object.prototype.toString;
4141

4242
/**
4343
* Strict object type check. Only returns true
4444
* for plain JavaScript objects.
4545
*/
4646
function isPlainObject (obj) {
47-
return toString.call(obj) === '[object Object]'
47+
return _toString.call(obj) === '[object Object]'
4848
}
4949

5050
function isRegExp (v) {
51-
return toString.call(v) === '[object RegExp]'
51+
return _toString.call(v) === '[object RegExp]'
5252
}
5353

5454
/**
5555
* Convert a value to a string that is actually rendered.
5656
*/
57-
function _toString (val) {
57+
function toString (val) {
5858
return val == null
5959
? ''
6060
: typeof val === 'object'
@@ -415,9 +415,11 @@ function parsePath (path) {
415415
}
416416
}
417417

418+
/* */
419+
418420
var warn = noop;
419421
var tip = noop;
420-
var formatComponentName;
422+
var formatComponentName = (null); // work around flow check
421423

422424
if (process.env.NODE_ENV !== 'production') {
423425
var hasConsole = typeof console !== 'undefined';
@@ -506,6 +508,8 @@ if (process.env.NODE_ENV !== 'production') {
506508
};
507509
}
508510

511+
/* */
512+
509513
function handleError (err, vm, info) {
510514
if (config.errorHandler) {
511515
config.errorHandler.call(null, err, vm, info);
@@ -1518,6 +1522,8 @@ function isType (type, fn) {
15181522
return false
15191523
}
15201524

1525+
/* */
1526+
15211527
var mark;
15221528
var measure;
15231529

@@ -1914,7 +1920,7 @@ function normalizeArrayChildren (children, nestedIndex) {
19141920
res.push.apply(res, normalizeArrayChildren(c, ((nestedIndex || '') + "_" + i)));
19151921
} else if (isPrimitive(c)) {
19161922
if (isDef(last) && isDef(last.text)) {
1917-
(last).text += String(c);
1923+
last.text += String(c);
19181924
} else if (c !== '') {
19191925
// convert primitive to vnode
19201926
res.push(createTextVNode(c));
@@ -1925,7 +1931,7 @@ function normalizeArrayChildren (children, nestedIndex) {
19251931
} else {
19261932
// default key for nested array children (likely generated by v-for)
19271933
if (isDef(c.tag) && isUndef(c.key) && isDef(nestedIndex)) {
1928-
c.key = "__vlist" + ((nestedIndex)) + "_" + i + "__";
1934+
c.key = "__vlist" + nestedIndex + "_" + i + "__";
19291935
}
19301936
res.push(c);
19311937
}
@@ -3275,7 +3281,7 @@ function createFunctionalComponent (
32753281
var propOptions = Ctor.options.props;
32763282
if (isDef(propOptions)) {
32773283
for (var key in propOptions) {
3278-
props[key] = validateProp(key, propOptions, propsData);
3284+
props[key] = validateProp(key, propOptions, propsData || {});
32793285
}
32803286
} else {
32813287
if (isDef(data.attrs)) { mergeProps(props, data.attrs); }
@@ -3604,7 +3610,7 @@ function _createElement (
36043610
// direct component options / constructor
36053611
vnode = createComponent(tag, data, context, children);
36063612
}
3607-
if (vnode !== undefined) {
3613+
if (isDef(vnode)) {
36083614
if (ns) { applyNS(vnode, ns); }
36093615
return vnode
36103616
} else {
@@ -3618,7 +3624,7 @@ function applyNS (vnode, ns) {
36183624
// use default namespace inside foreignObject
36193625
return
36203626
}
3621-
if (Array.isArray(vnode.children)) {
3627+
if (isDef(vnode.children)) {
36223628
for (var i = 0, l = vnode.children.length; i < l; i++) {
36233629
var child = vnode.children[i];
36243630
if (isDef(child.tag) && isUndef(child.ns)) {
@@ -3902,7 +3908,7 @@ function renderMixin (Vue) {
39023908
// code size.
39033909
Vue.prototype._o = markOnce;
39043910
Vue.prototype._n = toNumber;
3905-
Vue.prototype._s = _toString;
3911+
Vue.prototype._s = toString;
39063912
Vue.prototype._l = renderList;
39073913
Vue.prototype._t = renderSlot;
39083914
Vue.prototype._q = looseEqual;
@@ -4384,7 +4390,7 @@ Object.defineProperty(Vue$3.prototype, '$isServer', {
43844390
get: isServerRendering
43854391
});
43864392

4387-
Vue$3.version = '2.3.0';
4393+
Vue$3.version = '2.3.1';
43884394

43894395
/* */
43904396

@@ -6187,7 +6193,7 @@ function updateDOMProps (oldVnode, vnode) {
61876193
// non-string values will be stringified
61886194
elm._value = cur;
61896195
// avoid resetting cursor position when value is the same
6190-
var strCur = cur == null ? '' : String(cur);
6196+
var strCur = isUndef(cur) ? '' : String(cur);
61916197
if (shouldUpdateValue(elm, vnode, strCur)) {
61926198
elm.value = strCur;
61936199
}
@@ -6639,24 +6645,23 @@ function enter (vnode, toggleDisplay) {
66396645
return
66406646
}
66416647

6642-
var ref = (data);
6643-
var css = ref.css;
6644-
var type = ref.type;
6645-
var enterClass = ref.enterClass;
6646-
var enterToClass = ref.enterToClass;
6647-
var enterActiveClass = ref.enterActiveClass;
6648-
var appearClass = ref.appearClass;
6649-
var appearToClass = ref.appearToClass;
6650-
var appearActiveClass = ref.appearActiveClass;
6651-
var beforeEnter = ref.beforeEnter;
6652-
var enter = ref.enter;
6653-
var afterEnter = ref.afterEnter;
6654-
var enterCancelled = ref.enterCancelled;
6655-
var beforeAppear = ref.beforeAppear;
6656-
var appear = ref.appear;
6657-
var afterAppear = ref.afterAppear;
6658-
var appearCancelled = ref.appearCancelled;
6659-
var duration = ref.duration;
6648+
var css = data.css;
6649+
var type = data.type;
6650+
var enterClass = data.enterClass;
6651+
var enterToClass = data.enterToClass;
6652+
var enterActiveClass = data.enterActiveClass;
6653+
var appearClass = data.appearClass;
6654+
var appearToClass = data.appearToClass;
6655+
var appearActiveClass = data.appearActiveClass;
6656+
var beforeEnter = data.beforeEnter;
6657+
var enter = data.enter;
6658+
var afterEnter = data.afterEnter;
6659+
var enterCancelled = data.enterCancelled;
6660+
var beforeAppear = data.beforeAppear;
6661+
var appear = data.appear;
6662+
var afterAppear = data.afterAppear;
6663+
var appearCancelled = data.appearCancelled;
6664+
var duration = data.duration;
66606665

66616666
// activeInstance will always be the <transition> component managing this
66626667
// transition. One edge case to check is when the <transition> is placed
@@ -6788,18 +6793,17 @@ function leave (vnode, rm) {
67886793
return
67896794
}
67906795

6791-
var ref = (data);
6792-
var css = ref.css;
6793-
var type = ref.type;
6794-
var leaveClass = ref.leaveClass;
6795-
var leaveToClass = ref.leaveToClass;
6796-
var leaveActiveClass = ref.leaveActiveClass;
6797-
var beforeLeave = ref.beforeLeave;
6798-
var leave = ref.leave;
6799-
var afterLeave = ref.afterLeave;
6800-
var leaveCancelled = ref.leaveCancelled;
6801-
var delayLeave = ref.delayLeave;
6802-
var duration = ref.duration;
6796+
var css = data.css;
6797+
var type = data.type;
6798+
var leaveClass = data.leaveClass;
6799+
var leaveToClass = data.leaveToClass;
6800+
var leaveActiveClass = data.leaveActiveClass;
6801+
var beforeLeave = data.beforeLeave;
6802+
var leave = data.leave;
6803+
var afterLeave = data.afterLeave;
6804+
var leaveCancelled = data.leaveCancelled;
6805+
var delayLeave = data.delayLeave;
6806+
var duration = data.duration;
68036807

68046808
var expectsCSS = css !== false && !isIE9;
68056809
var userWantsControl = getHookArgumentsLength(leave);
@@ -6810,7 +6814,7 @@ function leave (vnode, rm) {
68106814
: duration
68116815
);
68126816

6813-
if (process.env.NODE_ENV !== 'production' && explicitLeaveDuration != null) {
6817+
if (process.env.NODE_ENV !== 'production' && isDef(explicitLeaveDuration)) {
68146818
checkDuration(explicitLeaveDuration, 'leave', vnode);
68156819
}
68166820

@@ -6847,7 +6851,7 @@ function leave (vnode, rm) {
68476851
}
68486852
// record leaving element
68496853
if (!vnode.data.show) {
6850-
(el.parentNode._pending || (el.parentNode._pending = {}))[vnode.key] = vnode;
6854+
(el.parentNode._pending || (el.parentNode._pending = {}))[(vnode.key)] = vnode;
68516855
}
68526856
beforeLeave && beforeLeave(el);
68536857
if (expectsCSS) {

0 commit comments

Comments
 (0)