BEMXJST: applyCtx should reset position

bem · Apr 28, 2017 · 578c89a · 578c89a
1 parent 693c49c
commit 578c89a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/lib/bemxjst/index.js b/lib/bemxjst/index.js
@@ -50,6 +50,10 @@ BEMXJST.prototype.compile = function(code) {
   var self = this;
 
   function applyCtx() {
+    return self.run(self.context.ctx);
+  }
+
+  function _applyCtx() {
     return self._run(self.context.ctx);
   }
 
@@ -59,7 +63,7 @@ BEMXJST.prototype.compile = function(code) {
       return self.local({ ctx: ctx }, applyCtx);
 
     return self.local(changes, function() {
-      return self.local({ ctx: ctx }, applyCtx);
+      return self.local({ ctx: ctx }, _applyCtx);
     });
   }
 

diff --git a/test/bemcontext-position-test.js b/test/bemcontext-position-test.js
@@ -178,4 +178,19 @@ describe('BEMContext this.position', function() {
       '<div class="b b_last_yes p_3"></div>' +
     '</div>');
   });
+
+  it('should properly set position with applyCtx()', function() {
+    test(function() {
+      block('a')(
+        def()(function() {
+          applyCtx({ block: 'session' });
+          applyCtx({ block: 'session' });
+          return applyNext();
+        }),
+        cls()(function() { return this.position; })
+      );
+    },
+    [ { block: 'a' }, { block: 'a' }, { block: 'a' } ],
+    '<div class="a 1"></div><div class="a 2"></div><div class="a 3"></div>');
+  });
 });