Merge pull request #30051 from zbraniecki/1137593-use-dir-instead-of-…

…bidi-when-displaying-notifications Bug 1137593 - Use notifcation options.dir instead of options.bidi. r=stas
mozilla-b2g · May 15, 2015 · d82f40e · d82f40e
2 parents 27f6760 + b2dee03
commit d82f40e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 12 deletions.
diff --git a/apps/system/js/notifications.js b/apps/system/js/notifications.js
@@ -417,8 +417,8 @@ var NotificationScreen = {
      * which creates a UI mess we can't control by changing
      * the system language.
      */
-    var dir = (detail.bidi === 'auto' || typeof detail.bidi === 'undefined') ?
-      document.documentElement.dir : detail.bidi;
+    var dir = (detail.dir === 'auto' || typeof detail.dir === 'undefined') ?
+      document.documentElement.dir : detail.dir;
 
     // We need to animate the ambient indicator when the toast
     // timesout, so we skip updating it here, by passing a skip bool
@@ -431,7 +431,7 @@ var NotificationScreen = {
     notificationNode.dataset.notificationId = detail.id;
     notificationNode.dataset.noClear = behavior.noclear ? 'true' : 'false';
     notificationNode.lang = detail.lang;
-    notificationNode.dataset.predefinedDir = detail.bidi;
+    notificationNode.dataset.predefinedDir = detail.dir;
 
     notificationNode.dataset.obsoleteAPI = 'false';
     if (typeof detail.id === 'string' &&
@@ -494,7 +494,7 @@ var NotificationScreen = {
       // but we still need to update type, lang and dir.
       oldNotif.dataset.type = type;
       oldNotif.lang = detail.lang;
-      oldNotif.dataset.predefinedDir = detail.bidi;
+      oldNotif.dataset.predefinedDir = detail.dir;
 
       notificationNode = oldNotif;
     } else {

diff --git a/apps/system/test/marionette/lib/lockscreen_notification_actions.js b/apps/system/test/marionette/lib/lockscreen_notification_actions.js
@@ -71,7 +71,7 @@
     if (detailsA.lang && detailsB.lang !== detailsA.lang) {
       return false;
     }
-    if (detailsA.bidi && detailsB.bidi !== detailsA.bidi) {
+    if (detailsA.dir && detailsB.dir !== detailsA.dir) {
       return false;
     }
     return true;

diff --git a/apps/system/test/marionette/lib/lockscreen_notification_selector.js b/apps/system/test/marionette/lib/lockscreen_notification_selector.js
@@ -119,9 +119,6 @@
     if (detailsA.lang && detailsB.lang !== detailsA.lang) {
       return false;
     }
-    if (detailsA.bidi && detailsB.bidi !== detailsA.bidi) {
-      return false;
-    }
     if (detailsA.dir && detailsB.dir !== detailsA.dir) {
       return false;
     }

diff --git a/apps/system/test/marionette/lib/notification.js b/apps/system/test/marionette/lib/notification.js
@@ -145,9 +145,6 @@ NotificationList.prototype = {
       if (details.lang && notification.lang !== details.lang) {
         continue;
       }
-      if (details.bidi && notification.bidi !== details.bidi) {
-        continue;
-      }
       if (details.dir && notification.dir !== details.dir) {
         continue;
       }

diff --git a/apps/system/test/unit/notifications_test.js b/apps/system/test/unit/notifications_test.js
@@ -382,7 +382,7 @@ suite('system/NotificationScreen >', function() {
       var detail = {icon: imgpath,
                     title: 'title',
                     detail: 'detail',
-                    bidi: dir};
+                    dir: dir};
       NotificationScreen.addNotification(detail);
       assert.equal(dir, toaster.dir);
       var notificationNode =