Skip to content

Commit aaf51d7

Browse files
yyx990803yyx990803
committed
[build] 1.0.26
1 parent f3e2a12 commit aaf51d7

File tree

5 files changed

+32
-20
lines changed

5 files changed

+32
-20
lines changed

‎dist/vue.common.js

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v1.0.25
2+
* Vue.js v1.0.26
33
* (c) 2016 Evan You
44
* Released under the MIT License.
55
*/
@@ -3409,7 +3409,7 @@ function traverse(val, seen) {
34093409
}
34103410
var isA = isArray(val);
34113411
var isO = isObject(val);
3412-
if (isA || isO) {
3412+
if ((isA || isO) && Object.isExtensible(val)) {
34133413
if (val.__ob__) {
34143414
var depId = val.__ob__.dep.id;
34153415
if (seen.has(depId)) {
@@ -4895,13 +4895,13 @@ var select = {
48954895
this.vm.$on('hook:attached', function () {
48964896
nextTick(_this.forceUpdate);
48974897
});
4898+
if (!inDoc(el)) {
4899+
nextTick(this.forceUpdate);
4900+
}
48984901
},
48994902

49004903
update: function update(value) {
49014904
var el = this.el;
4902-
if (!inDoc(el)) {
4903-
return nextTick(this.forceUpdate);
4904-
}
49054905
el.selectedIndex = -1;
49064906
var multi = this.multiple && isArray(value);
49074907
var options = el.options;
@@ -9849,7 +9849,13 @@ var filters = {
98499849

98509850
pluralize: function pluralize(value) {
98519851
var args = toArray(arguments, 1);
9852-
return args.length > 1 ? args[value % 10 - 1] || args[args.length - 1] : args[0] + (value === 1 ? '' : 's');
9852+
var length = args.length;
9853+
if (length > 1) {
9854+
var index = value % 10 - 1;
9855+
return index in args ? args[index] : args[length - 1];
9856+
} else {
9857+
return args[0] + (value === 1 ? '' : 's');
9858+
}
98539859
},
98549860

98559861
/**
@@ -10051,7 +10057,7 @@ function installGlobalAPI (Vue) {
1005110057

1005210058
installGlobalAPI(Vue);
1005310059

10054-
Vue.version = '1.0.25';
10060+
Vue.version = '1.0.26';
1005510061

1005610062
// devtools global hook
1005710063
/* istanbul ignore next */

‎dist/vue.js

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Vue.js v1.0.25
2+
* Vue.js v1.0.26
33
* (c) 2016 Evan You
44
* Released under the MIT License.
55
*/
@@ -3413,7 +3413,7 @@ var expression = Object.freeze({
34133413
}
34143414
var isA = isArray(val);
34153415
var isO = isObject(val);
3416-
if (isA || isO) {
3416+
if ((isA || isO) && Object.isExtensible(val)) {
34173417
if (val.__ob__) {
34183418
var depId = val.__ob__.dep.id;
34193419
if (seen.has(depId)) {
@@ -4899,13 +4899,13 @@ var template = Object.freeze({
48994899
this.vm.$on('hook:attached', function () {
49004900
nextTick(_this.forceUpdate);
49014901
});
4902+
if (!inDoc(el)) {
4903+
nextTick(this.forceUpdate);
4904+
}
49024905
},
49034906

49044907
update: function update(value) {
49054908
var el = this.el;
4906-
if (!inDoc(el)) {
4907-
return nextTick(this.forceUpdate);
4908-
}
49094909
el.selectedIndex = -1;
49104910
var multi = this.multiple && isArray(value);
49114911
var options = el.options;
@@ -9846,7 +9846,13 @@ var template = Object.freeze({
98469846

98479847
pluralize: function pluralize(value) {
98489848
var args = toArray(arguments, 1);
9849-
return args.length > 1 ? args[value % 10 - 1] || args[args.length - 1] : args[0] + (value === 1 ? '' : 's');
9849+
var length = args.length;
9850+
if (length > 1) {
9851+
var index = value % 10 - 1;
9852+
return index in args ? args[index] : args[length - 1];
9853+
} else {
9854+
return args[0] + (value === 1 ? '' : 's');
9855+
}
98509856
},
98519857

98529858
/**
@@ -10048,7 +10054,7 @@ var template = Object.freeze({
1004810054

1004910055
installGlobalAPI(Vue);
1005010056

10051-
Vue.version = '1.0.25';
10057+
Vue.version = '1.0.26';
1005210058

1005310059
// devtools global hook
1005410060
/* istanbul ignore next */

‎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.min.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import config from './config'
55

66
installGlobalAPI(Vue)
77

8-
Vue.version = '1.0.25'
8+
Vue.version = '1.0.26'
99

1010
export default Vue
1111

0 commit comments

Comments
 (0)