data.type == 'duplex'不做替换

peihexian · Nov 19, 2014 · c6e751a · c6e751a
1 parent bfa45a2
commit c6e751a
Show file tree

Hide file tree

Showing 5 changed files with 238 additions and 221 deletions.
diff --git a/avalon.js b/avalon.js
@@ -2470,20 +2470,22 @@
         if (!assigns.length && dataType === "duplex") {
             return
         }
-        //https://github.com/RubyLouvre/avalon/issues/583
-        data.vars.forEach(function(v) {
-            var reg = new RegExp("\\b" + v + "(?:\\.\\w+|\\[\\w+\\])+", "ig")
-            code = code.replace(reg, function(_) {
-                var c = _.charAt(v.length)
-                if (c === "." || c === "[") {
-                    var name = "var" + String(Math.random()).replace(/^0\./, "")
-                    assigns.push(name + " = " + _)
-                    return name
-                } else {
-                    return _
-                }
+        if (dataType !== "duplex") {
+            //https://github.com/RubyLouvre/avalon/issues/583
+            data.vars.forEach(function(v) {
+                var reg = new RegExp("\\b" + v + "(?:\\.\\w+|\\[\\w+\\])+", "ig")
+                code = code.replace(reg, function(_) {
+                    var c = _.charAt(v.length)
+                    if (c === "." || c === "[") {
+                        var name = "var" + String(Math.random()).replace(/^0\./, "")
+                        assigns.push(name + " = " + _)
+                        return name
+                    } else {
+                        return _
+                    }
+                })
             })
-        })
+        }
         //---------------args----------------
         if (filters) {
             args.push(avalon.filters)
@@ -2586,12 +2588,6 @@
         parseExpr(code, scopes, data)
         if (data.evaluator && !noregister) {
             data.handler = bindingExecutors[data.handlerName || data.type]
-            if (data.type === "if") {
-                console.log(data.evaluator + "")
-            }
-//            data.evaluator.toString = function() {
-//                return data.type + " binding to eval(" + code + ")"
-//            }
             //方便调试
             //这里非常重要,我们通过判定视图刷新函数的element是否在DOM树决定
             //将它移出订阅者列表