runtime: do not propagate default mods

Fix: #80
bem · Aug 3, 2015 · 3c7f239 · 3c7f239
1 parent 6b9de40
commit 3c7f239
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 7 deletions.
diff --git a/bench/package.json b/bench/package.json
@@ -11,7 +11,7 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "bem-xjst": "git+ssh://github.com/bem/bem-xjst.git#fccd9d4",
+    "bem-xjst": "git+ssh://github.com/bem/bem-xjst.git#6b9de40",
     "benchmark": "^1.0.0",
     "browserify": "^11.0.0",
     "microtime": "^1.4.2",

diff --git a/lib/bemhtml/runtime/context.js b/lib/bemhtml/runtime/context.js
@@ -13,10 +13,6 @@ function Context(bemhtml) {
   this.mods = {};
   this.elemMods = {};
 
-  // Original objects
-  this._mods = this.mods;
-  this._elemMods = this.elemMods;
-
   this.position = 0;
   this._listLength = 0;
   this._notNewList = false;

diff --git a/lib/bemhtml/runtime/index.js b/lib/bemhtml/runtime/index.js
@@ -302,7 +302,7 @@ BEMHTML.prototype.runOne = function runOne(json) {
     if (json.mods)
       context.mods = json.mods;
     else
-      context.mods = context._mods;
+      context.mods = {};
   } else {
     if (!json.elem)
       context.block = '';
@@ -314,7 +314,7 @@ BEMHTML.prototype.runOne = function runOne(json) {
   if (json.elemMods)
     context.elemMods = json.elemMods;
   else
-    context.elemMods = context._elemMods;
+    context.elemMods = {};
 
   var block = context.block || '';
   var elem = context.elem;

diff --git a/test/runtime-test.js b/test/runtime-test.js
@@ -256,6 +256,19 @@ describe('BEMHTML compiler/Runtime', function() {
         }
       }, '<div class="b1 b1_a_b"><div class="b2">yes</div></div>');
     });
+
+    it('should lazily override mods without propagating them', function() {
+      test(function() {
+        block('b1').def()(function() {
+          return applyNext({ 'mods.a': 'yes' });
+        });
+      }, {
+        block: 'b1',
+        content: {
+          block: 'b2'
+        }
+      }, '<div class="b1 b1_a_yes"><div class="b2"></div></div>');
+    });
   });
 
   describe('elemMods', function() {