没有必要就不要转换了

peihexian · Nov 20, 2014 · 26b7723 · 26b7723
1 parent 40f7463
commit 26b7723
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 55 deletions.
diff --git a/avalon.js b/avalon.js
@@ -1874,7 +1874,6 @@
                 var c = ronduplex.test(data.type) ? data : fn.apply(0, data.args)
                 data.handler(c, data.element, data)
             } catch (e) {
-                console.log(fn + "")
                 log("warning:exception throwed in [registerSubscriber] " + e)
                 delete data.evaluator
                 var node = data.element
@@ -2465,7 +2464,7 @@
         if (!assigns.length && dataType === "duplex") {
             return
         }
-        if (dataType !== "duplex") {
+        if (dataType !== "duplex" && (code.indexOf("||") > -1 || code.indexOf("&&") > -1)) {
             //https://github.com/RubyLouvre/avalon/issues/583
             data.vars.forEach(function(v) {
                 var reg = new RegExp("\\b" + v + "(?:\\.\\w+|\\[\\w+\\])+", "ig")