Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
build: build 2.6.1
  • Loading branch information
yyx990803 committed Feb 4, 2019
1 parent 66fd3c8 commit 6fb3a22
Show file tree
Hide file tree
Showing 19 changed files with 221 additions and 172 deletions.
46 changes: 26 additions & 20 deletions dist/vue.common.dev.js
@@ -1,5 +1,5 @@
/*!
* Vue.js v2.6.0
* Vue.js v2.6.1
* (c) 2014-2019 Evan You
* Released under the MIT License.
*/
Expand Down Expand Up @@ -1849,7 +1849,7 @@ function invokeWithErrorHandling (
var res;
try {
res = args ? handler.apply(context, args) : handler.call(context);
if (isPromise(res)) {
if (res && !res._isVue && isPromise(res)) {
res.catch(function (e) { return handleError(e, vm, info + " (Promise/async)"); });
}
} catch (e) {
Expand Down Expand Up @@ -4572,8 +4572,9 @@ function mergeHook$1 (f1, f2) {
// prop and event handler respectively.
function transformModel (options, data) {
var prop = (options.model && options.model.prop) || 'value';
var event = (options.model && options.model.event) || 'input'
;(data.props || (data.props = {}))[prop] = data.model.value;
var event = (options.model && options.model.event) || 'input';
var addTo = (options.props && prop in options.props) ? 'props' : 'attrs'
;(data[addTo] || (data[addTo] = {}))[prop] = data.model.value;
var on = data.on || (data.on = {});
var existing = on[event];
var callback = data.model.callback;
Expand Down Expand Up @@ -5319,7 +5320,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
value: FunctionalRenderContext
});

Vue.version = '2.6.0';
Vue.version = '2.6.1';

/* */

Expand Down Expand Up @@ -6640,8 +6641,8 @@ function baseSetAttr (el, key, value) {
/* istanbul ignore if */
if (
isIE && !isIE9 &&
(el.tagName === 'TEXTAREA' || el.tagName === 'INPUT') &&
key === 'placeholder' && !el.__ieph
el.tagName === 'TEXTAREA' &&
key === 'placeholder' && value !== '' && !el.__ieph
) {
var blocker = function (e) {
e.stopImmediatePropagation();
Expand Down Expand Up @@ -9121,10 +9122,11 @@ var decodingMap = {
'"': '"',
'&': '&',
'
': '\n',
'	': '\t'
'	': '\t',
''': "'"
};
var encodedAttr = /&(?:lt|gt|quot|amp);/g;
var encodedAttrWithNewLines = /&(?:lt|gt|quot|amp|#10|#9);/g;
var encodedAttr = /&(?:lt|gt|quot|amp|#39);/g;
var encodedAttrWithNewLines = /&(?:lt|gt|quot|amp|#39|#10|#9);/g;

// #5992
var isIgnoreNewlineTag = makeMap('pre,textarea', true);
Expand Down Expand Up @@ -9743,16 +9745,20 @@ function parse (
}
},
comment: function comment (text, start, end) {
var child = {
type: 3,
text: text,
isComment: true
};
if (options.outputSourceRange) {
child.start = start;
child.end = end;
// adding anyting as a sibling to the root node is forbidden
// comments should still be allowed, but ignored
if (currentParent) {
var child = {
type: 3,
text: text,
isComment: true
};
if (options.outputSourceRange) {
child.start = start;
child.end = end;
}
currentParent.children.push(child);
}
currentParent.children.push(child);
}
});
return root
Expand Down Expand Up @@ -11047,7 +11053,7 @@ function genInlineTemplate (el, state) {
{ start: el.start }
);
}
if (ast.type === 1) {
if (ast && ast.type === 1) {
var inlineRenderFns = generate(ast, state.options);
return ("inlineTemplate:{render:function(){" + (inlineRenderFns.render) + "},staticRenderFns:[" + (inlineRenderFns.staticRenderFns.map(function (code) { return ("function(){" + code + "}"); }).join(',')) + "]}")
}
Expand Down
4 changes: 2 additions & 2 deletions dist/vue.common.prod.js

Large diffs are not rendered by default.

46 changes: 26 additions & 20 deletions dist/vue.esm.browser.js
@@ -1,5 +1,5 @@
/*!
* Vue.js v2.6.0
* Vue.js v2.6.1
* (c) 2014-2019 Evan You
* Released under the MIT License.
*/
Expand Down Expand Up @@ -1880,7 +1880,7 @@ function invokeWithErrorHandling (
let res;
try {
res = args ? handler.apply(context, args) : handler.call(context);
if (isPromise(res)) {
if (res && !res._isVue && isPromise(res)) {
res.catch(e => handleError(e, vm, info + ` (Promise/async)`));
}
} catch (e) {
Expand Down Expand Up @@ -4615,8 +4615,9 @@ function mergeHook$1 (f1, f2) {
// prop and event handler respectively.
function transformModel (options, data) {
const prop = (options.model && options.model.prop) || 'value';
const event = (options.model && options.model.event) || 'input'
;(data.props || (data.props = {}))[prop] = data.model.value;
const event = (options.model && options.model.event) || 'input';
const addTo = (options.props && prop in options.props) ? 'props' : 'attrs'
;(data[addTo] || (data[addTo] = {}))[prop] = data.model.value;
const on = data.on || (data.on = {});
const existing = on[event];
const callback = data.model.callback;
Expand Down Expand Up @@ -5352,7 +5353,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
value: FunctionalRenderContext
});

Vue.version = '2.6.0';
Vue.version = '2.6.1';

/* */

Expand Down Expand Up @@ -6670,8 +6671,8 @@ function baseSetAttr (el, key, value) {
/* istanbul ignore if */
if (
isIE && !isIE9 &&
(el.tagName === 'TEXTAREA' || el.tagName === 'INPUT') &&
key === 'placeholder' && !el.__ieph
el.tagName === 'TEXTAREA' &&
key === 'placeholder' && value !== '' && !el.__ieph
) {
const blocker = e => {
e.stopImmediatePropagation();
Expand Down Expand Up @@ -9140,10 +9141,11 @@ const decodingMap = {
'"': '"',
'&': '&',
'
': '\n',
'	': '\t'
'	': '\t',
''': "'"
};
const encodedAttr = /&(?:lt|gt|quot|amp);/g;
const encodedAttrWithNewLines = /&(?:lt|gt|quot|amp|#10|#9);/g;
const encodedAttr = /&(?:lt|gt|quot|amp|#39);/g;
const encodedAttrWithNewLines = /&(?:lt|gt|quot|amp|#39|#10|#9);/g;

// #5992
const isIgnoreNewlineTag = makeMap('pre,textarea', true);
Expand Down Expand Up @@ -9762,16 +9764,20 @@ function parse (
}
},
comment (text, start, end) {
const child = {
type: 3,
text,
isComment: true
};
if (options.outputSourceRange) {
child.start = start;
child.end = end;
// adding anyting as a sibling to the root node is forbidden
// comments should still be allowed, but ignored
if (currentParent) {
const child = {
type: 3,
text,
isComment: true
};
if (options.outputSourceRange) {
child.start = start;
child.end = end;
}
currentParent.children.push(child);
}
currentParent.children.push(child);
}
});
return root
Expand Down Expand Up @@ -11104,7 +11110,7 @@ function genInlineTemplate (el, state) {
{ start: el.start }
);
}
if (ast.type === 1) {
if (ast && ast.type === 1) {
const inlineRenderFns = generate(ast, state.options);
return `inlineTemplate:{render:function(){${
inlineRenderFns.render
Expand Down
4 changes: 2 additions & 2 deletions dist/vue.esm.browser.min.js

Large diffs are not rendered by default.

46 changes: 26 additions & 20 deletions dist/vue.esm.js
@@ -1,5 +1,5 @@
/*!
* Vue.js v2.6.0
* Vue.js v2.6.1
* (c) 2014-2019 Evan You
* Released under the MIT License.
*/
Expand Down Expand Up @@ -1853,7 +1853,7 @@ function invokeWithErrorHandling (
var res;
try {
res = args ? handler.apply(context, args) : handler.call(context);
if (isPromise(res)) {
if (res && !res._isVue && isPromise(res)) {
res.catch(function (e) { return handleError(e, vm, info + " (Promise/async)"); });
}
} catch (e) {
Expand Down Expand Up @@ -4585,8 +4585,9 @@ function mergeHook$1 (f1, f2) {
// prop and event handler respectively.
function transformModel (options, data) {
var prop = (options.model && options.model.prop) || 'value';
var event = (options.model && options.model.event) || 'input'
;(data.props || (data.props = {}))[prop] = data.model.value;
var event = (options.model && options.model.event) || 'input';
var addTo = (options.props && prop in options.props) ? 'props' : 'attrs'
;(data[addTo] || (data[addTo] = {}))[prop] = data.model.value;
var on = data.on || (data.on = {});
var existing = on[event];
var callback = data.model.callback;
Expand Down Expand Up @@ -5339,7 +5340,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
value: FunctionalRenderContext
});

Vue.version = '2.6.0';
Vue.version = '2.6.1';

/* */

Expand Down Expand Up @@ -6662,8 +6663,8 @@ function baseSetAttr (el, key, value) {
/* istanbul ignore if */
if (
isIE && !isIE9 &&
(el.tagName === 'TEXTAREA' || el.tagName === 'INPUT') &&
key === 'placeholder' && !el.__ieph
el.tagName === 'TEXTAREA' &&
key === 'placeholder' && value !== '' && !el.__ieph
) {
var blocker = function (e) {
e.stopImmediatePropagation();
Expand Down Expand Up @@ -9149,10 +9150,11 @@ var decodingMap = {
'"': '"',
'&': '&',
'
': '\n',
'	': '\t'
'	': '\t',
''': "'"
};
var encodedAttr = /&(?:lt|gt|quot|amp);/g;
var encodedAttrWithNewLines = /&(?:lt|gt|quot|amp|#10|#9);/g;
var encodedAttr = /&(?:lt|gt|quot|amp|#39);/g;
var encodedAttrWithNewLines = /&(?:lt|gt|quot|amp|#39|#10|#9);/g;

// #5992
var isIgnoreNewlineTag = makeMap('pre,textarea', true);
Expand Down Expand Up @@ -9772,16 +9774,20 @@ function parse (
}
},
comment: function comment (text, start, end) {
var child = {
type: 3,
text: text,
isComment: true
};
if (process.env.NODE_ENV !== 'production' && options.outputSourceRange) {
child.start = start;
child.end = end;
// adding anyting as a sibling to the root node is forbidden
// comments should still be allowed, but ignored
if (currentParent) {
var child = {
type: 3,
text: text,
isComment: true
};
if (process.env.NODE_ENV !== 'production' && options.outputSourceRange) {
child.start = start;
child.end = end;
}
currentParent.children.push(child);
}
currentParent.children.push(child);
}
});
return root
Expand Down Expand Up @@ -11081,7 +11087,7 @@ function genInlineTemplate (el, state) {
{ start: el.start }
);
}
if (ast.type === 1) {
if (ast && ast.type === 1) {
var inlineRenderFns = generate(ast, state.options);
return ("inlineTemplate:{render:function(){" + (inlineRenderFns.render) + "},staticRenderFns:[" + (inlineRenderFns.staticRenderFns.map(function (code) { return ("function(){" + code + "}"); }).join(',')) + "]}")
}
Expand Down

0 comments on commit 6fb3a22

Please sign in to comment.