Merge pull request #153 from bem/supportBemXjst4x

Support bem-xjst 4.x

Author: awinogradov

common.blocks/checkbox-group/checkbox-group.bemhtml

@@ -1,11 +1,11 @@
 block('checkbox-group')(
 
-    match(this._form_field).def()(function() {
-	var ctx = this.ctx;
+    match(function() { return this._form_field; }).def()(function() {
+        var ctx = this.ctx;
 
-	ctx.name = ctx.name || this._form_field.name;
+        ctx.name || (ctx.name = this._form_field.name);
 
-	applyNext();
+        return applyNext();
     })
 
 );

common.blocks/checkbox/checkbox.bemhtml

@@ -1,11 +1,11 @@
 block('checkbox')(
 
-    match(this._form_field).def()(function() {
+    match(function() { return this._form_field; }).def()(function() {
         var ctx = this.ctx;
 
-        ctx.name = ctx.name || this._form_field.name;
+        ctx.name || (ctx.name = this._form_field.name);
 
-        applyNext();
+        return applyNext();
     })
 
 );

common.blocks/form-field/_required/form-field_required.bemhtml

@@ -1,3 +1,3 @@
-block('form-field').match(this.ctx.mods.required)(
+block('form-field').match(function() { return this.ctx.mods.required; })(
     mix()({ mods : { 'has-validation' : true } })
 )

common.blocks/form-field/_type/form-field_type_hidden.bemhtml

@@ -4,14 +4,16 @@ block('form-field').mod('type', 'hidden')(
     }),
 
     content()(function() {
+        var ctx = this.ctx;
+
         return [
             {
                 tag : 'input',
                 attrs : {
                     type : 'hidden',
-                    name : this.ctx.name,
-                    id : this.ctx.id,
-                    value : this.ctx.val
+                    name : ctx.name,
+                    id : ctx.id,
+                    value : ctx.val
                 }
             }
         ];

common.blocks/form-field/_validate/form-field_validate.bemhtml

@@ -1,3 +1,3 @@
-block('form-field').match(this.ctx.mods.validate)(
+block('form-field').match(function() { return this.ctx.mods.validate; })(
     mix()({ mods : { 'has-validation' : true } })
 )

common.blocks/form-field/form-field.bemhtml

@@ -8,7 +8,7 @@ block('form-field')(
 
         _form_field.mods.name = _form_field.name;
 
-        applyNext({ _form_field : _form_field });
+        return applyNext({ _form_field : _form_field });
     })
 
 );

common.blocks/form/_has-validation/form_has-validation.bemhtml

@@ -1,7 +1,7 @@
 block('form').mod('has-validation', true)(
     attrs()(function() {
         var attrs = applyNext();
-        attrs['novalidate'] = true;
+        attrs.novalidate = true;
         return attrs;
     })
 );

common.blocks/form/form.bemhtml

@@ -5,10 +5,12 @@ block('form')(
     js()(true),
 
     attrs()(function() {
+        var ctx = this.ctx;
+
         return {
-            action : this.ctx.action,
-            enctype : this.ctx.enctype,
-            method : this.ctx.method
+            action : ctx.action,
+            enctype : ctx.enctype,
+            method : ctx.method
         };
     })
 

common.blocks/input/__control/input__control.bemhtml

@@ -1,9 +1,9 @@
 block('input').elem('control')(
 
-    match(this._form_field).def()(function() {
+    match(function() { return this._form_field; }).def()(function() {
         this._input.id = this._input.id || this._form_field.id;
         this._input.name = this._input.name || this._form_field.name;
 
-        applyNext();
+        return applyNext();
     })
 );

common.blocks/label/label.bemhtml

@@ -6,7 +6,7 @@ block('label')(
         return { for : this.ctx.for };
     }),
 
-    match(this._form_field).attrs()(function() {
+    match(function() { return this._form_field; }).attrs()(function() {
         return { for : this._form_field.id };
     })
 

common.blocks/radio-group/radio-group.bemhtml

@@ -1,10 +1,10 @@
 block('radio-group')(
 
-    match(this._form_field).def()(function() {
+    match(function() { return this._form_field; }).def()(function() {
         var ctx = this.ctx;
 
-        ctx.name = ctx.name || this._form_field.name;
+        ctx.name || (ctx.name = this._form_field.name);
 
-        applyNext();
+        return applyNext();
     })
 );

common.blocks/radio/radio.bemhtml

@@ -1,11 +1,11 @@
 block('radio')(
 
-    match(this._form_field).def()(function() {
+    match(function() { return this._form_field; }).def()(function() {
         var ctx = this.ctx;
 
-        ctx.name = ctx.name || this._form_field.name;
+        ctx.name || (ctx.name = this._form_field.name);
 
-        applyNext();
+        return applyNext();
     })
 
 );

common.blocks/select/select.bemhtml

@@ -1,11 +1,11 @@
 block('select')(
 
-    match(this._form_field).def()(function() {
-	var ctx = this.ctx;
+    match(function() { return this._form_field; }).def()(function() {
+        var ctx = this.ctx;
 
-	ctx.name = ctx.name || this._form_field.name;
+        ctx.name || (ctx.name = this._form_field.name);
 
-	applyNext();
+        return applyNext();
     })
 
 );

common.blocks/textarea/textarea.bemhtml

@@ -1,12 +1,12 @@
 block('textarea')(
 
-    match(this._form_field).def()(function() {
+    match(function() { return this._form_field; }).def()(function() {
         var ctx = this.ctx;
 
-        ctx.id = ctx.id || this._form_field.id;
-        ctx.name = ctx.name || this._form_field.name;
+        ctx.id || (ctx.id = this._form_field.id);
+        ctx.name || (ctx.name = this._form_field.name);
 
-        applyNext();
+        return applyNext();
     })
 
 );