Browse Source

[build] 1.0.26

Evan You 10 years ago
parent
commit
aaf51d75aa
5 changed files with 28 additions and 16 deletions
  1. 13 7
      dist/vue.common.js
  2. 13 7
      dist/vue.js
  3. 1 1
      dist/vue.min.js
  4. 0 0
      dist/vue.min.js.map
  5. 1 1
      src/index.js

+ 13 - 7
dist/vue.common.js

@@ -1,5 +1,5 @@
 /*!
- * Vue.js v1.0.25
+ * Vue.js v1.0.26
  * (c) 2016 Evan You
  * Released under the MIT License.
  */
@@ -3409,7 +3409,7 @@ function traverse(val, seen) {
   }
   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)) {
@@ -4895,13 +4895,13 @@ var select = {
     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;
@@ -9849,7 +9849,13 @@ var filters = {
 
   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');
+    }
   },
 
   /**
@@ -10051,7 +10057,7 @@ function installGlobalAPI (Vue) {
 
 installGlobalAPI(Vue);
 
-Vue.version = '1.0.25';
+Vue.version = '1.0.26';
 
 // devtools global hook
 /* istanbul ignore next */

+ 13 - 7
dist/vue.js

@@ -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 */

File diff suppressed because it is too large
+ 1 - 1
dist/vue.min.js


File diff suppressed because it is too large
+ 0 - 0
dist/vue.min.js.map


+ 1 - 1
src/index.js

@@ -5,7 +5,7 @@ import config from './config'
 
 installGlobalAPI(Vue)
 
-Vue.version = '1.0.25'
+Vue.version = '1.0.26'
 
 export default Vue
 

Some files were not shown because too many files changed in this diff