better m-show implementation (perf boost)

kbrsh · Mar 25, 2017 · 718ff7b · 718ff7b
1 parent e63d63e
commit 718ff7b
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/dist/moon.js b/dist/moon.js
@@ -1530,6 +1530,12 @@
       }
     };
 
+    specialDirectives[Moon.config.prefix + "show"] = {
+      duringPropGenerate: function (value, meta, vnode) {
+        return '"m-show": ' + compileTemplate(value, false) + ', ';
+      }
+    };
+
     specialDirectives[Moon.config.prefix + "for"] = {
       afterGenerate: function (value, meta, code, vnode) {
         var parts = value.split(" in ");
@@ -1658,12 +1664,7 @@
     };
 
     directives[Moon.config.prefix + "show"] = function (el, val, vnode) {
-      var evaluated = new Function("return " + val);
-      if (!evaluated()) {
-        el.style.display = 'none';
-      } else {
-        el.style.display = 'block';
-      }
+      el.style.display = val ? '' : 'none';
     };
 
     directives[Moon.config.prefix + "mask"] = function (el, val, vnode) {};

diff --git a/dist/moon.min.js b/dist/moon.min.js
diff --git a/src/directives/default.js b/src/directives/default.js
@@ -6,6 +6,12 @@ specialDirectives[Moon.config.prefix + "if"] = {
   }
 }
 
+specialDirectives[Moon.config.prefix + "show"] = {
+  duringPropGenerate: function(value, meta, vnode) {
+    return `"m-show": ${compileTemplate(value, false)}, `;
+  }
+}
+
 specialDirectives[Moon.config.prefix + "for"] = {
   afterGenerate: function(value, meta, code, vnode) {
     var parts = value.split(" in ");
@@ -134,12 +140,7 @@ specialDirectives[Moon.config.prefix + "text"] = {
 }
 
 directives[Moon.config.prefix + "show"] = function(el, val, vnode) {
-  var evaluated = new Function("return " + val);
-  if(!evaluated()) {
-    el.style.display = 'none';
-  } else {
-    el.style.display = 'block';
-  }
+  el.style.display = (val ? '' : 'none');
 }
 
 directives[Moon.config.prefix + "mask"] = function(el, val, vnode) {

diff --git a/test/js/test.js b/test/js/test.js
@@ -345,7 +345,7 @@ describe("Directive", function() {
       }
     });
     it('should display when true', function() {
-      expect(document.getElementById('show-condition').style.display).to.equal('block');
+      expect(document.getElementById('show-condition').style.display).to.equal('');
     });
     it('should not display when false', function() {
       showApp.set('condition', false);