8000 1.0.26 · poorprogrammer/vuejs.org@8701ade · GitHub
[go: up one dir, main page]
Skip to content

Commit 8701ade

Browse files
yyx990803yyx990803
committed
1.0.26
1 parent cd1dbb8 commit 8701ade

File tree

4 files changed

+22
-16
lines changed

4 files changed

+22
-16
lines changed

‎src/guide/installation.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
title: Installation< 10000 /span>
33
type: guide
44
order: 0
5-
vue_version: 1.0.25
6-
dev_size: "266.31"
7-
min_size: "74.97"
8-
gz_size: "26.02"
5+
vue_version: 1.0.26
6+
dev_size: "266.44"
7+
min_size: "75.01"
8+
gz_size: "26.03"
99
---
1010

1111
### Compatibility Note

‎themes/vue/_config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
google_analytics: UA-46852172-1
22
root_domain: vuejs.org
3-
vue_version: 1.0.25
3+
vue_version: 1.0.26

‎themes/vue/source/js/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 */

‎themes/vue/source/js/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.

0 commit comments

Comments
 (0)
0