|
|
@@ -1,5 +1,5 @@
|
|
|
/*!
|
|
|
- * Vue.js v1.0.25
|
|
|
+ * Vue.js v1.0.26
|
|
|
* (c) 2016 Evan You
|
|
|
* Released under the MIT License.
|
|
|
*/
|
|
|
@@ -3413,7 +3413,7 @@ var expression = Object.freeze({
|
|
|
}
|
|
|
var isA = isArray(val);
|
|
|
var isO = isObject(val);
|
|
|
- if (isA || isO) {
|
|
|
+ if ((isA || isO) && Object.isExtensible(val)) {
|
|
|
if (val.__ob__) {
|
|
|
var depId = val.__ob__.dep.id;
|
|
|
if (seen.has(depId)) {
|
|
|
@@ -4899,13 +4899,13 @@ var template = Object.freeze({
|
|
|
this.vm.$on('hook:attached', function () {
|
|
|
nextTick(_this.forceUpdate);
|
|
|
});
|
|
|
+ if (!inDoc(el)) {
|
|
|
+ nextTick(this.forceUpdate);
|
|
|
+ }
|
|
|
},
|
|
|
|
|
|
update: function update(value) {
|
|
|
var el = this.el;
|
|
|
- if (!inDoc(el)) {
|
|
|
- return nextTick(this.forceUpdate);
|
|
|
- }
|
|
|
el.selectedIndex = -1;
|
|
|
var multi = this.multiple && isArray(value);
|
|
|
var options = el.options;
|
|
|
@@ -9846,7 +9846,13 @@ var template = Object.freeze({
|
|
|
|
|
|
pluralize: function pluralize(value) {
|
|
|
var args = toArray(arguments, 1);
|
|
|
- return args.length > 1 ? args[value % 10 - 1] || args[args.length - 1] : args[0] + (value === 1 ? '' : 's');
|
|
|
+ var length = args.length;
|
|
|
+ if (length > 1) {
|
|
|
+ var index = value % 10 - 1;
|
|
|
+ return index in args ? args[index] : args[length - 1];
|
|
|
+ } else {
|
|
|
+ return args[0] + (value === 1 ? '' : 's');
|
|
|
+ }
|
|
|
},
|
|
|
|
|
|
/**
|
|
|
@@ -10048,7 +10054,7 @@ var template = Object.freeze({
|
|
|
|
|
|
installGlobalAPI(Vue);
|
|
|
|
|
|
- Vue.version = '1.0.25';
|
|
|
+ Vue.version = '1.0.26';
|
|
|
|
|
|
// devtools global hook
|
|
|
/* istanbul ignore next */
|