Merge pull request #24863 from jobara/1069380

Bug 1069380 - Use link role instead of button for open action in cards view
mozilla-b2g · Oct 9, 2014 · 1d3e427 · 1d3e427
2 parents eb23ec5 + 04c378b
commit 1d3e427
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/apps/system/js/card.js b/apps/system/js/card.js
@@ -71,7 +71,7 @@
    */
   Card.prototype._template =
     '<div class="screenshotView bb-button" data-l10n-id="openCard" ' +
-    '  role="button"></div>' +
+    '  role="link"></div>' +
     '<div class="appIconView" style="background-image:{iconValue}"></div>' +
     '' +
     '<div class="titles">' +
@@ -81,7 +81,7 @@
     '' +
     '<footer class="card-tray">'+
     ' <button class="appIcon" data-l10n-id="openCard" ' +
-    '   data-button-action="select"></button>' +
+    '   data-button-action="select" aria-hidden="true"></button>' +
     ' <menu class="buttonbar">' +
     '   <button class="close-button bb-button" data-l10n-id="closeCard" ' +
     '     data-button-action="close" role="button" ' +
@@ -335,4 +335,3 @@
   return (exports.Card = Card);
 
 })(window);
-
diff --git a/apps/system/test/unit/card_test.js b/apps/system/test/unit/card_test.js
@@ -83,6 +83,13 @@ suite('system/Card', function() {
       assert.ok(header.id, 'h1.id');
     });
 
+    test('has expected aria values', function(){
+      var card = this.card;
+
+      assert.equal(card.screenshotView.getAttribute('role'), 'link');
+      assert.strictEqual(card.iconButton.getAttribute('aria-hidden'), 'true');
+    });
+
     test('adds browser class for browser windows', function(){
       var app = makeApp({ name: 'browserwindow' });
       this.sinon.stub(app, 'isBrowser', function() {