Skip to content

Commit

Permalink
build: build 2.6.10
Browse files Browse the repository at this point in the history
  • Loading branch information
yyx990803 committed Mar 20, 2019
1 parent f11449d commit e7b912a
Show file tree
Hide file tree
Showing 19 changed files with 336 additions and 160 deletions.
54 changes: 36 additions & 18 deletions dist/vue.common.dev.js
@@ -1,5 +1,5 @@
/*!
* Vue.js v2.6.9
* Vue.js v2.6.10
* (c) 2014-2019 Evan You
* Released under the MIT License.
*/
Expand Down Expand Up @@ -2544,8 +2544,8 @@ function normalizeScopedSlots (
prevSlots
) {
var res;
var isStable = slots ? !!slots.$stable : true;
var hasNormalSlots = Object.keys(normalSlots).length > 0;
var isStable = slots ? !!slots.$stable : !hasNormalSlots;
var key = slots && slots.$key;
if (!slots) {
res = {};
Expand Down Expand Up @@ -3629,7 +3629,9 @@ function resolveAsyncComponent (

if (owner && !isDef(factory.owners)) {
var owners = factory.owners = [owner];
var sync = true
var sync = true;
var timerLoading = null;
var timerTimeout = null

;(owner).$on('hook:destroyed', function () { return remove(owners, owner); });

Expand All @@ -3640,6 +3642,14 @@ function resolveAsyncComponent (

if (renderCompleted) {
owners.length = 0;
if (timerLoading !== null) {
clearTimeout(timerLoading);
timerLoading = null;
}
if (timerTimeout !== null) {
clearTimeout(timerTimeout);
timerTimeout = null;
}
}
};

Expand Down Expand Up @@ -3686,7 +3696,8 @@ function resolveAsyncComponent (
if (res.delay === 0) {
factory.loading = true;
} else {
setTimeout(function () {
timerLoading = setTimeout(function () {
timerLoading = null;
if (isUndef(factory.resolved) && isUndef(factory.error)) {
factory.loading = true;
forceRender(false);
Expand All @@ -3696,7 +3707,8 @@ function resolveAsyncComponent (
}

if (isDef(res.timeout)) {
setTimeout(function () {
timerTimeout = setTimeout(function () {
timerTimeout = null;
if (isUndef(factory.resolved)) {
reject(
"timeout (" + (res.timeout) + "ms)"
Expand Down Expand Up @@ -4242,16 +4254,21 @@ var getNow = Date.now;
// timestamp can either be hi-res (relative to page load) or low-res
// (relative to UNIX epoch), so in order to compare time we have to use the
// same timestamp type when saving the flush timestamp.
if (
inBrowser &&
window.performance &&
typeof performance.now === 'function' &&
document.createEvent('Event').timeStamp <= performance.now()
) {
// if the event timestamp is bigger than the hi-res timestamp
// (which is evaluated AFTER) it means the event is using a lo-res timestamp,
// and we need to use the lo-res version for event listeners as well.
getNow = function () { return performance.now(); };
// All IE versions use low-res event timestamps, and have problematic clock
// implementations (#9632)
if (inBrowser && !isIE) {
var performance = window.performance;
if (
performance &&
typeof performance.now === 'function' &&
getNow() > document.createEvent('Event').timeStamp
) {
// if the event timestamp, although evaluated AFTER the Date.now(), is
// smaller than it, it means the event is using a hi-res timestamp,
// and we need to use the hi-res version for event listener timestamps as
// well.
getNow = function () { return performance.now(); };
}
}

/**
Expand Down Expand Up @@ -5416,7 +5433,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
value: FunctionalRenderContext
});

Vue.version = '2.6.9';
Vue.version = '2.6.10';

/* */

Expand Down Expand Up @@ -7578,10 +7595,11 @@ function updateDOMProps (oldVnode, vnode) {
}

for (key in oldProps) {
if (isUndef(props[key])) {
if (!(key in props)) {
elm[key] = '';
}
}

for (key in props) {
cur = props[key];
// ignore children if the node has textContent or innerHTML,
Expand Down Expand Up @@ -10698,7 +10716,7 @@ function isDirectChildOfTemplateFor (node) {

/* */

var fnExpRE = /^([\w$_]+|\([^)]*?\))\s*=>|^function\s*\(/;
var fnExpRE = /^([\w$_]+|\([^)]*?\))\s*=>|^function\s*(?:[\w$]+)?\s*\(/;
var fnInvokeRE = /\([^)]*?\);*$/;
var simplePathRE = /^[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*|\['[^']*?']|\["[^"]*?"]|\[\d+]|\[[A-Za-z_$][\w$]*])*$/;

Expand Down
4 changes: 2 additions & 2 deletions dist/vue.common.prod.js

Large diffs are not rendered by default.

54 changes: 36 additions & 18 deletions dist/vue.esm.browser.js
@@ -1,5 +1,5 @@
/*!
* Vue.js v2.6.9
* Vue.js v2.6.10
* (c) 2014-2019 Evan You
* Released under the MIT License.
*/
Expand Down Expand Up @@ -2572,8 +2572,8 @@ function normalizeScopedSlots (
prevSlots
) {
let res;
const isStable = slots ? !!slots.$stable : true;
const hasNormalSlots = Object.keys(normalSlots).length > 0;
const isStable = slots ? !!slots.$stable : !hasNormalSlots;
const key = slots && slots.$key;
if (!slots) {
res = {};
Expand Down Expand Up @@ -3650,7 +3650,9 @@ function resolveAsyncComponent (

if (owner && !isDef(factory.owners)) {
const owners = factory.owners = [owner];
let sync = true
let sync = true;
let timerLoading = null;
let timerTimeout = null

;(owner).$on('hook:destroyed', () => remove(owners, owner));

Expand All @@ -3661,6 +3663,14 @@ function resolveAsyncComponent (

if (renderCompleted) {
owners.length = 0;
if (timerLoading !== null) {
clearTimeout(timerLoading);
timerLoading = null;
}
if (timerTimeout !== null) {
clearTimeout(timerTimeout);
timerTimeout = null;
}
}
};

Expand Down Expand Up @@ -3707,7 +3717,8 @@ function resolveAsyncComponent (
if (res.delay === 0) {
factory.loading = true;
} else {
setTimeout(() => {
timerLoading = setTimeout(() => {
timerLoading = null;
if (isUndef(factory.resolved) && isUndef(factory.error)) {
factory.loading = true;
forceRender(false);
Expand All @@ -3717,7 +3728,8 @@ function resolveAsyncComponent (
}

if (isDef(res.timeout)) {
setTimeout(() => {
timerTimeout = setTimeout(() => {
timerTimeout = null;
if (isUndef(factory.resolved)) {
reject(
`timeout (${res.timeout}ms)`
Expand Down Expand Up @@ -4263,16 +4275,21 @@ let getNow = Date.now;
// timestamp can either be hi-res (relative to page load) or low-res
// (relative to UNIX epoch), so in order to compare time we have to use the
// same timestamp type when saving the flush timestamp.
if (
inBrowser &&
window.performance &&
typeof performance.now === 'function' &&
document.createEvent('Event').timeStamp <= performance.now()
) {
// if the event timestamp is bigger than the hi-res timestamp
// (which is evaluated AFTER) it means the event is using a lo-res timestamp,
// and we need to use the lo-res version for event listeners as well.
getNow = () => performance.now();
// All IE versions use low-res event timestamps, and have problematic clock
// implementations (#9632)
if (inBrowser && !isIE) {
const performance = window.performance;
if (
performance &&
typeof performance.now === 'function' &&
getNow() > document.createEvent('Event').timeStamp
) {
// if the event timestamp, although evaluated AFTER the Date.now(), is
// smaller than it, it means the event is using a hi-res timestamp,
// and we need to use the hi-res version for event listener timestamps as
// well.
getNow = () => performance.now();
}
}

/**
Expand Down Expand Up @@ -5447,7 +5464,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
value: FunctionalRenderContext
});

Vue.version = '2.6.9';
Vue.version = '2.6.10';

/* */

Expand Down Expand Up @@ -7601,10 +7618,11 @@ function updateDOMProps (oldVnode, vnode) {
}

for (key in oldProps) {
if (isUndef(props[key])) {
if (!(key in props)) {
elm[key] = '';
}
}

for (key in props) {
cur = props[key];
// ignore children if the node has textContent or innerHTML,
Expand Down Expand Up @@ -10711,7 +10729,7 @@ function isDirectChildOfTemplateFor (node) {

/* */

const fnExpRE = /^([\w$_]+|\([^)]*?\))\s*=>|^function\s*\(/;
const fnExpRE = /^([\w$_]+|\([^)]*?\))\s*=>|^function\s*(?:[\w$]+)?\s*\(/;
const fnInvokeRE = /\([^)]*?\);*$/;
const simplePathRE = /^[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*|\['[^']*?']|\["[^"]*?"]|\[\d+]|\[[A-Za-z_$][\w$]*])*$/;

Expand Down
4 changes: 2 additions & 2 deletions dist/vue.esm.browser.min.js

Large diffs are not rendered by default.

54 changes: 36 additions & 18 deletions dist/vue.esm.js
@@ -1,5 +1,5 @@
/*!
* Vue.js v2.6.9
* Vue.js v2.6.10
* (c) 2014-2019 Evan You
* Released under the MIT License.
*/
Expand Down Expand Up @@ -2550,8 +2550,8 @@ function normalizeScopedSlots (
prevSlots
) {
var res;
var isStable = slots ? !!slots.$stable : true;
var hasNormalSlots = Object.keys(normalSlots).length > 0;
var isStable = slots ? !!slots.$stable : !hasNormalSlots;
var key = slots && slots.$key;
if (!slots) {
res = {};
Expand Down Expand Up @@ -3639,7 +3639,9 @@ function resolveAsyncComponent (

if (owner && !isDef(factory.owners)) {
var owners = factory.owners = [owner];
var sync = true
var sync = true;
var timerLoading = null;
var timerTimeout = null

;(owner).$on('hook:destroyed', function () { return remove(owners, owner); });

Expand All @@ -3650,6 +3652,14 @@ function resolveAsyncComponent (

if (renderCompleted) {
owners.length = 0;
if (timerLoading !== null) {
clearTimeout(timerLoading);
timerLoading = null;
}
if (timerTimeout !== null) {
clearTimeout(timerTimeout);
timerTimeout = null;
}
}
};

Expand Down Expand Up @@ -3696,7 +3706,8 @@ function resolveAsyncComponent (
if (res.delay === 0) {
factory.loading = true;
} else {
setTimeout(function () {
timerLoading = setTimeout(function () {
timerLoading = null;
if (isUndef(factory.resolved) && isUndef(factory.error)) {
factory.loading = true;
forceRender(false);
Expand All @@ -3706,7 +3717,8 @@ function resolveAsyncComponent (
}

if (isDef(res.timeout)) {
setTimeout(function () {
timerTimeout = setTimeout(function () {
timerTimeout = null;
if (isUndef(factory.resolved)) {
reject(
process.env.NODE_ENV !== 'production'
Expand Down Expand Up @@ -4254,16 +4266,21 @@ var getNow = Date.now;
// timestamp can either be hi-res (relative to page load) or low-res
// (relative to UNIX epoch), so in order to compare time we have to use the
// same timestamp type when saving the flush timestamp.
if (
inBrowser &&
window.performance &&
typeof performance.now === 'function' &&
document.createEvent('Event').timeStamp <= performance.now()
) {
// if the event timestamp is bigger than the hi-res timestamp
// (which is evaluated AFTER) it means the event is using a lo-res timestamp,
// and we need to use the lo-res version for event listeners as well.
getNow = function () { return performance.now(); };
// All IE versions use low-res event timestamps, and have problematic clock
// implementations (#9632)
if (inBrowser && !isIE) {
var performance = window.performance;
if (
performance &&
typeof performance.now === 'function' &&
getNow() > document.createEvent('Event').timeStamp
) {
// if the event timestamp, although evaluated AFTER the Date.now(), is
// smaller than it, it means the event is using a hi-res timestamp,
// and we need to use the hi-res version for event listener timestamps as
// well.
getNow = function () { return performance.now(); };
}
}

/**
Expand Down Expand Up @@ -5436,7 +5453,7 @@ Object.defineProperty(Vue, 'FunctionalRenderContext', {
value: FunctionalRenderContext
});

Vue.version = '2.6.9';
Vue.version = '2.6.10';

/* */

Expand Down Expand Up @@ -7600,10 +7617,11 @@ function updateDOMProps (oldVnode, vnode) {
}

for (key in oldProps) {
if (isUndef(props[key])) {
if (!(key in props)) {
elm[key] = '';
}
}

for (key in props) {
cur = props[key];
// ignore children if the node has textContent or innerHTML,
Expand Down Expand Up @@ -10729,7 +10747,7 @@ function isDirectChildOfTemplateFor (node) {

/* */

var fnExpRE = /^([\w$_]+|\([^)]*?\))\s*=>|^function\s*\(/;
var fnExpRE = /^([\w$_]+|\([^)]*?\))\s*=>|^function\s*(?:[\w$]+)?\s*\(/;
var fnInvokeRE = /\([^)]*?\);*$/;
var simplePathRE = /^[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*|\['[^']*?']|\["[^"]*?"]|\[\d+]|\[[A-Za-z_$][\w$]*])*$/;

Expand Down

0 comments on commit e7b912a

Please sign in to comment.