BEMHTML: use proper boolean values for attribute

bem · Feb 10, 2016 · f994f18 · f994f18
1 parent 2318775
commit f994f18
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 15 deletions.
diff --git a/common.blocks/button/_togglable/button_togglable_check.bemhtml b/common.blocks/button/_togglable/button_togglable_check.bemhtml
@@ -1,3 +1,3 @@
 block('button').mod('togglable', 'check').attrs()(function() {
-    return this.extend(applyNext(), { 'aria-pressed' : !!this.mods.checked });
+    return this.extend(applyNext(), { 'aria-pressed' : (!!this.mods.checked).toString() });
 });
diff --git a/common.blocks/button/_togglable/button_togglable_radio.bemhtml b/common.blocks/button/_togglable/button_togglable_radio.bemhtml
@@ -1,3 +1,3 @@
 block('button').mod('togglable', 'radio').attrs()(function() {
-    return this.extend(applyNext(), { 'aria-pressed' : !!this.mods.checked });
+    return this.extend(applyNext(), { 'aria-pressed' : (!!this.mods.checked).toString() });
 });
diff --git a/common.blocks/button/_type/button_type_link.bemhtml b/common.blocks/button/_type/button_type_link.bemhtml
@@ -7,7 +7,7 @@ block('button').mod('type', 'link')(
 
         ctx.target && (attrs.target = ctx.target);
         this.mods.disabled?
-            attrs['aria-disabled'] = true :
+            attrs['aria-disabled'] = 'true' :
             attrs.href = ctx.url;
 
         return this.extend(applyNext(), attrs);

diff --git a/common.blocks/button/button.bemhtml b/common.blocks/button/button.bemhtml
@@ -27,7 +27,7 @@ block('button')(
                 };
 
             this.mods.disabled &&
-                !this._isRealButton && (attrs['aria-disabled'] = true);
+                !this._isRealButton && (attrs['aria-disabled'] = 'true');
 
             return attrs;
         },

diff --git a/common.blocks/checkbox/_type/checkbox_type_button.bemhtml b/common.blocks/checkbox/_type/checkbox_type_button.bemhtml
@@ -15,7 +15,7 @@ block('checkbox').mod('type', 'button')(
             attrs : {
                 role : 'checkbox',
                 'aria-pressed' : undefined,
-                'aria-checked' : !!mods.checked
+                'aria-checked' : (!!mods.checked).toString()
             },
             title : ctx.title,
             content : [

diff --git a/common.blocks/dropdown/_switcher/dropdown_switcher_button.bemhtml b/common.blocks/dropdown/_switcher/dropdown_switcher_button.bemhtml
@@ -16,9 +16,9 @@ block('dropdown').mod('switcher', 'button').elem('switcher').def()(function() {
         resMods.theme || (resMods.theme = dropdownMods.theme);
         resMods.disabled = dropdownMods.disabled;
 
-        resAttrs['aria-haspopup'] = true;
+        resAttrs['aria-haspopup'] = 'true';
         resAttrs['aria-controls'] = this._popupId;
-        resAttrs['aria-expanded'] = false;
+        resAttrs['aria-expanded'] = 'false';
 
         res.mix = apply('mix');
     }

diff --git a/common.blocks/dropdown/_switcher/dropdown_switcher_link.bemhtml b/common.blocks/dropdown/_switcher/dropdown_switcher_link.bemhtml
@@ -15,9 +15,9 @@ block('dropdown').mod('switcher', 'link').elem('switcher').def()(function() {
         resMods.theme || (resMods.theme = dropdownMods.theme);
         resMods.disabled = dropdownMods.disabled;
 
-        resAttrs['aria-haspopup'] = true;
+        resAttrs['aria-haspopup'] = 'true';
         resAttrs['aria-controls'] = this._popupId;
-        resAttrs['aria-expanded'] = false;
+        resAttrs['aria-expanded'] = 'false';
 
         res.mix = apply('mix');
     }

diff --git a/common.blocks/link/link.bemhtml b/common.blocks/link/link.bemhtml
@@ -26,7 +26,7 @@ block('link')(
                 tabIndex = ctx.tabIndex || 0;
             }
         } else {
-            attrs['aria-disabled'] = true;
+            attrs['aria-disabled'] = 'true';
         }
 
         typeof tabIndex === 'undefined' || (attrs.tabindex = tabIndex);

diff --git a/common.blocks/menu-item/menu-item.bemhtml b/common.blocks/menu-item/menu-item.bemhtml
@@ -17,8 +17,8 @@ block('menu-item')(
             attrs = {
                 role : role,
                 id : this.generateId(),
-                'aria-disabled' : mods.disabled,
-                'aria-checked' : menuMode && !!mods.checked
+                'aria-disabled' : mods && mods.disabled && 'true' || undefined,
+                'aria-checked' : menuMode && (!!mods.checked).toString()
             };
 
         return attrs;

diff --git a/common.blocks/menu/menu.bemhtml b/common.blocks/menu/menu.bemhtml
@@ -43,7 +43,7 @@ block('menu')(
         var attrs = { role : 'menu' };
 
         this.mods.disabled?
-            attrs['aria-disabled'] = true :
+            attrs['aria-disabled'] = 'true' :
             attrs.tabindex = 0;
 
         return attrs;

diff --git a/common.blocks/modal/modal.bemhtml b/common.blocks/modal/modal.bemhtml
@@ -11,7 +11,7 @@ block('modal')(
 
     attrs()({
         role : 'dialog',
-        'aria-hidden' : true
+        'aria-hidden' : 'true'
     }),
 
     content()(function() {

diff --git a/common.blocks/popup/popup.bemhtml b/common.blocks/popup/popup.bemhtml
@@ -9,5 +9,5 @@ block('popup')(
             zIndexGroupLevel : ctx.zIndexGroupLevel
         };
     }),
-    attrs()({ 'aria-hidden' : true })
+    attrs()({ 'aria-hidden' : 'true' })
 );