Merge pull request #20580 from DouglasSherk/1019546-dialer-contacts-o…

…verlap Bug 1019546 - [Dialer][Visual Refresh] Fix dialpad and contacts overlapping when moving from one to the other. r=etienne
mozilla-b2g · Jun 24, 2014 · 136cf20 · 136cf20
1 parent a1a1072
commit 136cf20
Show file tree

Hide file tree

Showing 4 changed files with 60 additions and 3 deletions.
diff --git a/apps/communications/dialer/js/dialer.js b/apps/communications/dialer/js/dialer.js
@@ -10,7 +10,7 @@ var NavbarManager = {
     this.update();
     var self = this;
     window.addEventListener('hashchange' , function nm_hashChange(event) {
-      // TODO Implement it with building blocks:
+      // FIXME/bug 1026079: Implement it with building blocks:
       // https://github.com/jcarpenter/Gaia-UI-Building-Blocks/blob/master/inprogress/tabs.css
       // https://github.com/jcarpenter/Gaia-UI-Building-Blocks/blob/master/inprogress/tabs.html
       self.update();
@@ -96,7 +96,9 @@ var NavbarManager = {
         }
 
         contacts.classList.add('toolbar-option-selected');
-        AccessibilityHelper.setAriaSelected(contacts, tabs);
+        this.ensureResources(function() {
+          AccessibilityHelper.setAriaSelected(contacts, tabs);
+        });
         break;
       case '#keyboard-view':
         checkContactsTab();

diff --git a/apps/communications/dialer/test/unit/dialer_test.js b/apps/communications/dialer/test/unit/dialer_test.js
@@ -3,7 +3,8 @@
 /* global CallHandler, MocksHelper, MockLazyL10n, MockNavigatormozApps,
    MockNavigatorMozIccManager, MockNavigatormozSetMessageHandler,
    NavbarManager, Notification, MockKeypadManager, MockVoicemail,
-   MockCallLog, MockCallLogDBManager, MockNavigatorWakeLock, MmiManager */
+   MockCallLog, MockCallLogDBManager, MockNavigatorWakeLock, MmiManager,
+   LazyLoader, AccessibilityHelper */
 
 require(
   '/shared/test/unit/mocks/mock_navigator_moz_set_message_handler.js'
@@ -548,4 +549,44 @@ suite('navigation bar', function() {
       sinon.assert.called(NavbarManager.show);
     });
   });
+
+  suite('accessibility helper', function() {
+    var loadSpy;
+    var hash;
+
+    setup(function() {
+      loadSpy = this.sinon.spy(LazyLoader, 'load');
+      this.sinon.spy(AccessibilityHelper, 'setAriaSelected');
+
+      hash = window.location.hash;
+
+      NavbarManager.resourcesLoaded = false;
+    });
+
+    teardown(function() {
+      window.location.hash = hash;
+    });
+
+    ['#call-log-view',
+     '#contacts-view',
+     '#keyboard-view'].forEach(function(view) {
+      test('should load accessibility helper before using it in view ' + view,
+      function(done) {
+        function handleHashChange(event) {
+          window.removeEventListener('hashchange', handleHashChange);
+
+          assert.isTrue(loadSpy.getCall(0).args[0].indexOf(
+            '/shared/js/accessibility_helper.js') !== -1);
+          sinon.assert.callOrder(
+            loadSpy, AccessibilityHelper.setAriaSelected);
+
+          done();
+        }
+
+        window.addEventListener('hashchange', handleHashChange);
+
+        window.location.hash = view;
+      });
+    });
+  });
 });
diff --git a/apps/communications/dialer/test/unit/mock_call_log.js b/apps/communications/dialer/test/unit/mock_call_log.js
@@ -3,6 +3,7 @@
 /* exported MockCallLog */
 
 var MockCallLog = {
+  init: function() {},
   appendGroup: function(group) {
   }
 };

diff --git a/shared/style/dialer/dialer.css b/shared/style/dialer/dialer.css
@@ -49,3 +49,16 @@ a:hover, a:active, a:focus {
 body.hidden *[data-l10n-id] {
   visibility: hidden;
 }
+
+/**
+ * FIXME/bug 1026079: Remove these when tabs are implemented using building
+ * blocks. They are temporary overrides for clipping issues.
+ */
+body .bb-tablist [aria-selected="true"] ~.bb-tabpanel {
+  visibility: hidden;
+}
+
+body .bb-tablist :target .bb-tabpanel {
+  z-index: -1;
+  visibility: visible;
+}