Merge pull request #161 from bem/jsfix

Fix bug with `ctx.js()`
bem · Aug 21, 2015 · 710faad · 710faad
2 parents bccaa4f + b9e11f4
commit 710faad
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/lib/bh.js b/lib/bh.js
@@ -435,12 +435,10 @@ function BH() {
          * @returns {Boolean|Object|Ctx}
          */
         js: function(js, force) {
-            if (js === undefined) {
-                return this.ctx.js;
-            }
-            this.ctx.js = force ?
-                (js === true ? {} : js) :
-                js ? this.extend(this.ctx.js, js) : this.ctx.js;
+            var ctx = this.ctx;
+            if (js === undefined) return ctx.js;
+            if (force || ctx.js === undefined) ctx.js = js;
+            else if (ctx.js !== false) this.extend(ctx.js, js);
             return this;
         },
         /**

diff --git a/test/test.js.js b/test/test.js.js
@@ -28,6 +28,13 @@ describe('ctx.js()', function() {
         bh.apply({ block: 'button' }).should.equal('<div class="button"></div>');
     });
 
+    it('should not override user declarations', function() {
+        bh.match('button', function(ctx) {
+            ctx.js(true);
+        });
+        bh.apply({ block: 'button', js: false }).should.equal('<div class="button"></div>');
+    });
+
     it('should extend user js', function() {
         bh.match('button', function(ctx) {
             ctx.js({ a: 2 });
@@ -36,7 +43,7 @@ describe('ctx.js()', function() {
             .should.equal('<div class="button i-bem" onclick=\'return {"button":{"x":1,"a":2}}\'></div>');
     });
 
-    it('should not override later declarations', function() {
+    it('should not override later declarations #1', function() {
         bh.match('button', function(ctx) {
             ctx.js(false);
         });
@@ -46,6 +53,16 @@ describe('ctx.js()', function() {
         bh.apply({ block: 'button' }).should.equal('<div class="button i-bem" onclick=\'return {"button":{}}\'></div>');
     });
 
+    it('should not override later declarations #2', function() {
+        bh.match('button', function(ctx) {
+            ctx.js(true);
+        });
+        bh.match('button', function(ctx) {
+            ctx.js(false);
+        });
+        bh.apply({ block: 'button' }).should.equal('<div class="button"></div>');
+    });
+
     it('should override later declarations with force flag', function() {
         bh.match('button', function(ctx) {
             ctx.js(true, true);