fix visible bug

RubyLouvre · RubyLouvre · commit 84cf6f2307a0 · 2013-06-09T12:42:57.000+08:00
diff --git a/avalon.js b/avalon.js
@@ -784,7 +784,7 @@
             }
         }
     };
-    function updateViewModel(a, b, isArray) {
+    function updateViewModel(a, b, isArray,c) {
         if (isArray) {
             var an = a.length,
                     bn = b.length;
@@ -801,6 +801,7 @@
             for (var i in b) {
                 if (b.hasOwnProperty(i) && a.hasOwnProperty(i) && i !== "$id") {
                     a[i] = b[i];
+                    c[i] = b[i];
                 }
             }
         }
@@ -1475,8 +1476,11 @@
         },
         //控制元素显示或隐藏
         "visible": function(data, scopes) {
-            watchView(data.value, scopes, data, function(val, elem) {
-                elem.style.display = val ? parseDisplay(elem.tagName) : "none";
+            var elem = data.element;
+            var display = avalon(elem).css("display");
+            display = display === "none" ? parseDisplay(elem.tagName) : display;
+            watchView(data.value, scopes, data, function(val) {
+                elem.style.display = val ? display : "none";
             });
         },
         //这是一个字符串属性绑定的范本, 方便你在title, alt,  src, href添加插值表达式
@@ -1858,13 +1862,9 @@
         "sort,reverse".replace(rword, function(method) {
             collection[method] = function() {
                 var ret = list[method].apply(list, arguments);
-                for(var i = 0, n = list.length; i < n ; i++){
-                    var el = list[i];
-                    collection.set(i, el);
+                for(var i = 0; i < ret.length; i++){
+                   var el = ret[i];
                 }
-               // ret.forEach(function(el, i) {
-               //      collection.set(i, el);
-               //});
                 return this;
             };
         });
@@ -1898,9 +1898,10 @@
                     if (val.$json) {
                         val = val.$json;
                     }
-                    updateViewModel(this[index], val, Array.isArray(val));
+                    updateViewModel(this[index], val, Array.isArray(val), list[index]);
                 } else if (this[index] !== val) {
                     this[index] = val;
+
                     model && model.$fire(prop + ".changed");
                     notifySubscribers(this, "set", arguments);
                 }
@@ -2435,4 +2436,4 @@
 //2013.5.22 0.6.3 fix getValueFunction bug; fix  avalon.bind return false bug;fix ms-css bug
 //2013.5.25 0.7 添加template绑定, 优化渲染速度,插入与移除节点的操作
 //2013 6 2 3群月王 ms-visible bug
-//黄轩http://www.cnblogs.com/lcllao/archive/2012/09/30/2709187.html
+//黄轩http://www.cnblogs.com/lcllao/archive/2012/09/30/2709187.html
