i-bem: use skipApplyNext before entering content

Skip all `applyNext()` flags before entering the `content` to support
recursive blocks with `applyNext()` (see test).

Author: indutny

common.blocks/i-bem/i-bem.bemhtml

@@ -11,7 +11,9 @@ var undef,
     },
     SHORT_TAGS = { // хэш для быстрого определения, является ли тэг коротким
         area : 1, base : 1, br : 1, col : 1, command : 1, embed : 1, hr : 1, img : 1,
-        input : 1, keygen : 1, link : 1, meta : 1, param : 1, source : 1, wbr : 1 };
+        input : 1, keygen : 1, link : 1, meta : 1, param : 1, source : 1, wbr : 1 },
+    skipApplyNext = context.skipApplyNext ||
+                    function noop(ctx, cb) { return cb.call(ctx); };
 
 (function(BEM, undefined) {
 
@@ -188,6 +190,7 @@ function BEMContext(context, apply_) {
     this.elem = undef;
     this.mods = undef;
     this.elemMods = undef;
+    this._skipApplyNext = skipApplyNext;
 }
 
 BEMContext.prototype.isArray = isArray;
@@ -453,12 +456,14 @@ def()(function() {
 
             var content = apply('content');
             if(content || content === 0) {
-                isBEM = vBlock || this.elem;
-                apply('', {
-                    _notNewList : false,
-                    position : isBEM? 1 : this.position,
-                    _listLength : isBEM? 1 : this._listLength,
-                    ctx : content
+                this._skipApplyNext(this, function() {
+                    isBEM = vBlock || this.elem;
+                    apply('', {
+                        _notNewList : false,
+                        position : isBEM? 1 : this.position,
+                        _listLength : isBEM? 1 : this._listLength,
+                        ctx : content
+                    });
                 });
             }
 

common.blocks/i-bem/i-bem.test.bemhtml/files/i-bem/skip-apply-next.bemhtml

@@ -0,0 +1,5 @@
+block('b1').def()(function() {
+  return local({ 'ctx.tag': 'span' })(function() {
+    return applyNext();
+  });
+});

common.blocks/i-bem/i-bem.test.bemhtml/files/i-bem/skip-apply-next.html

@@ -0,0 +1 @@
+<span class="b1"><span class="b1"></span></span>

common.blocks/i-bem/i-bem.test.bemhtml/files/i-bem/skip-apply-next.json

@@ -0,0 +1,6 @@
+{
+  "block": "b1",
+  "content": [{
+    "block": "b1"
+  }]
+}

common.blocks/i-bem/i-bem.test.bemhtml/i-bem-test.js

@@ -47,4 +47,5 @@ suite('i-bem block and others', function() {
   unit('boolean mods bem-core/169', 'boolean-mods');
   unit('mods redefinition bem-core/441', 'redefine-mods');
   unit('mix with same block bem-core/804', 'gh-core-804');
+  unit('skip apply next when entering content', 'skip-apply-next');
 });