Merge pull request #1022 from bem/bem-xjst-2x@v2

Update templates to support bem-xjst 2.x
bem · Jun 11, 2015 · 91a4e19 · 91a4e19
2 parents 83d4b4b + 215d36c
commit 91a4e19
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 33 deletions.
diff --git a/common.blocks/i-bem/i-bem.test.bemhtml/files/i-bem/redefine-mods.bemhtml b/common.blocks/i-bem/i-bem.test.bemhtml/files/i-bem/redefine-mods.bemhtml
@@ -1,6 +1,6 @@
 block('b1').def()(function() {
     this.mods.foo = 'bar';
-    applyNext();
+    return applyNext();
 });
 block('b1').content()('foo bar');
 block('b1').mod('foo', 'bar').content()('foo bar');
diff --git a/common.blocks/page/page.bemhtml b/common.blocks/page/page.bemhtml
@@ -4,7 +4,7 @@ block('page')(
         var ctx = this.ctx;
         this._nonceCsp = ctx.nonce;
 
-        applyCtx([
+        return applyCtx([
             ctx.doctype || '<!DOCTYPE html>',
             {
                 tag : 'html',
@@ -16,7 +16,7 @@ block('page')(
                             { tag : 'meta', attrs : { charset : 'utf-8' } },
                             ctx.uaCompatible === false? '' : {
                                 tag : 'meta',
-                                attrs: {
+                                attrs : {
                                     'http-equiv' : 'X-UA-Compatible',
                                     content : ctx.uaCompatible || 'IE=edge'
                                 }

diff --git a/desktop.blocks/page/__css/page__css.bemhtml b/desktop.blocks/page/__css/page__css.bemhtml
@@ -1,30 +1,24 @@
-block('page').elem('css')(
-    def()
-        .match(function() { return this.ctx.hasOwnProperty('ie'); })
-        .match(function() { return !this.ctx._ieCommented; })(
-            function() {
-                var ie = this.ctx.ie,
-                    hideRule = !ie?
-                        ['gt IE 9', '<!-->', '<!--'] :
-                        ie === '!IE'?
-                            [ie, '<!-->', '<!--'] :
-                            [ie, '', ''];
-                apply(
-                    '',
-                    { 'ctx._ieCommented' : true },
-                    {
-                        ctx : [
-                            '<!--[if ' + hideRule[0] + ']>' + hideRule[1],
-                            this.ctx,
-                            hideRule[2] + '<![endif]-->'
-                        ]
-                    }
-                );
-            },
-            match(function() { return this.ctx.ie === true; })(function() {
-                var url = this.ctx.url;
-                applyCtx([6, 7, 8, 9].map(function(v) {
-                    return { elem : 'css', url : url + '.ie' + v + '.css', ie : 'IE ' + v };
-                }));
-            }))
+block('page').elem('css').def().match(function() {
+    return this.ctx.hasOwnProperty('ie');
+})(
+    function() {
+        var ie = this.ctx.ie,
+            hideRule = !ie?
+                ['gt IE 9', '<!-->', '<!--'] :
+                ie === '!IE'?
+                    [ie, '<!-->', '<!--'] :
+                    [ie, '', ''];
+
+        return applyCtx([
+            '<!--[if ' + hideRule[0] + ']>' + hideRule[1],
+            this.ctx,
+            hideRule[2] + '<![endif]-->'
+        ]);
+    },
+    match(function() { return this.ctx.ie === true; })(function() {
+        var url = this.ctx.url;
+        return applyCtx([6, 7, 8, 9].map(function(v) {
+            return { elem : 'css', url : url + '.ie' + v + '.css', ie : 'IE ' + v };
+        }));
+    })
 );
diff --git a/touch.blocks/page/__icon/page__icon.bemhtml b/touch.blocks/page/__icon/page__icon.bemhtml
@@ -1,6 +1,6 @@
 block('page').elem('icon').def()(function() {
     var ctx = this.ctx;
-    applyCtx([
+    return applyCtx([
         ctx.src16 && {
             elem : 'link',
             attrs : { rel : 'shortcut icon', href : ctx.src16 }