runtime: fix mix overwriting jsParams

bem · Apr 27, 2015 · adf3216 · adf3216
1 parent 8b8ab29
commit adf3216
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 2 deletions.
diff --git a/lib/bemhtml/runtime/index.js b/lib/bemhtml/runtime/index.js
@@ -317,8 +317,8 @@ BEMHTML.prototype.render = function render(context,
     if (mix) {
       var m = this.renderMix(entity, totalMix, jsParams, addJSInitClass);
       out += m.out;
-      jsParams = out.jsParams;
-      addJSInitClass = out.addJSInitClass;
+      jsParams = m.jsParams;
+      addJSInitClass = m.addJSInitClass;
     }
 
     if (cls)

diff --git a/test/runtime-test.js b/test/runtime-test.js
@@ -123,6 +123,27 @@ describe('BEMHTML compiler/Runtime', function() {
       }, '<a class="b1 b1_x_10 b2 b2_modname_modval b3__e3 b3__e3_modname_1">' +
          '</a>');
     });
+
+    it('should check that mix do not overwrite jsParams', function() {
+      test(function() {
+        block('b1')(
+          js()(true),
+          mix()([ { block: 'b2' } ])
+        );
+      }, {
+        block: 'b1'
+      }, '<div class="b1 b2 i-bem" data-bem="{&quot;b1&quot;:{}}"></div>');
+    });
+
+    it('should support singular mix', function() {
+      test(function() {
+        block('b1')(
+          mix()({ block: 'b2' })
+        );
+      }, {
+        block: 'b1'
+      }, '<div class="b1 b2"></div>');
+    });
   });
 
   describe('position in Context', function() {