Merge pull request #20736 from snowmantw/issue1027471

Bug 1027471 - [LockScreen][System] Split notification.js into LockScreen...
mozilla-b2g · Jul 9, 2014 · c394b7b · c394b7b
2 parents 5886383 + 61ab5bf
commit c394b7b
Show file tree

Hide file tree

Showing 28 changed files with 1,253 additions and 613 deletions.
diff --git a/apps/system/index.html b/apps/system/index.html
@@ -223,6 +223,7 @@
     <!-- Notifications -->
     <link rel="stylesheet" type="text/css" href="style/notifications/notifications.css">
     <script defer src="js/notifications.js"></script>
+    <script defer src="js/lockscreen_notifications.js"></script>
 
     <!-- Downloads -->
     <link rel="stylesheet" type="text/css" href="style/notifications/downloads.css">

diff --git a/apps/system/js/app_install_manager.js b/apps/system/js/app_install_manager.js
@@ -436,7 +436,7 @@ var AppInstallManager = {
     }
 
     appInfo.installNotification = newNode;
-    NotificationScreen.incExternalNotifications();
+    window.dispatchEvent(new window.CustomEvent('notification-increase'));
   },
 
   getNotificationProgressNode: function ai_getNotificationProgressNode(app) {
@@ -488,7 +488,7 @@ var AppInstallManager = {
 
     node.parentNode.removeChild(node);
     delete appInfo.installNotification;
-    NotificationScreen.decExternalNotifications();
+    window.dispatchEvent(new window.CustomEvent('notification-descrease'));
   },
 
   requestWifiLock: function ai_requestWifiLock(app) {

diff --git a/apps/system/js/bootstrap.js b/apps/system/js/bootstrap.js
@@ -66,6 +66,30 @@ window.addEventListener('load', function startup() {
     window.textSelectionDialog = new TextSelectionDialog();
   }
 
+  function setupNotifications() {
+    if ('mozSettings' in navigator && navigator.mozSettings) {
+      var key = 'notifications.resend';
+      var req = navigator.mozSettings.createLock().get(key);
+      req.onsuccess = function onsuccess() {
+        var resendEnabled = req.result[key] || false;
+        if (!resendEnabled) {
+          return;
+        }
+
+        var resendCallback = (function(number) {
+          window.dispatchEvent(
+            new CustomEvent('desktop-notification-resend',
+              { detail: { number: number } }));
+        }).bind(this);
+
+        if ('mozChromeNotifications' in navigator) {
+          navigator.mozChromeNotifications.
+            mozResendAllNotifications(resendCallback);
+        }
+      };
+    }
+  }
+
   function safelyLaunchFTU() {
     window.addEventListener('homescreen-ready', function onHomescreenReady() {
       window.removeEventListener('homescreen-ready', onHomescreenReady);
@@ -75,6 +99,8 @@ window.addEventListener('load', function startup() {
     window.homescreenLauncher = new HomescreenLauncher().start();
   }
 
+  setupNotifications();
+
   if (applications.ready) {
     registerGlobalEntries();
     safelyLaunchFTU();

diff --git a/apps/system/js/captive_portal.js b/apps/system/js/captive_portal.js
@@ -33,20 +33,30 @@ var CaptivePortal = {
       return;
     }
 
-    this.notification = NotificationScreen.addNotification({
-      id: id, title: '', text: message, icon: icon
-    });
-    this.captiveNotification_onTap = function() {
-      self.notification.removeEventListener('tap',
-                                            self.captiveNotification_onTap);
-      self.captiveNotification_onTap = null;
-      NotificationScreen.removeNotification(id);
+    window.dispatchEvent(new window.CustomEvent('notification-add', { detail:
+      { id: id, title: '',
+        text: message,
+        icon: icon,
+        onsuccess: (function onsuccess(notification) {
+          this.notification = notification;
+          this.notification.addEventListener('tap',
+            this.captiveNotification_onTap);
+        }).bind(this)
+      }})
+    );
+
+    this.captiveNotification_onTap = (function() {
+      this.notification.removeEventListener('tap',
+        this.captiveNotification_onTap);
+      this.captiveNotification_onTap = null;
+      window.dispatchEvent(new window.CustomEvent('notification-remove',
+      { detail: id }));
       new MozActivity({
         name: 'view',
         data: { type: 'url', url: url }
       });
-    };
-    this.notification.addEventListener('tap', this.captiveNotification_onTap);
+    }).bind(this);
+
   },
 
   dismissNotification: function dismissNotification(id) {
@@ -57,7 +67,10 @@ var CaptivePortal = {
                                                 this.captiveNotification_onTap);
           this.captiveNotification_onTap = null;
         }
-        NotificationScreen.removeNotification(id);
+
+        window.dispatchEvent(new window.CustomEvent('notification-remove',
+        { detail: id }));
+
         this.notification = null;
       }
 

diff --git a/apps/system/js/carrier_info_notifier.js b/apps/system/js/carrier_info_notifier.js
@@ -45,12 +45,16 @@ var CarrierInfoNotifier = {
 
     // If we are on the lock screen then create a notification
     // that invokes the dialog
-    var notification = NotificationScreen.addNotification({
-      id: ++this._notificationId,
-      title: title,
-      text: message
-    });
-    notification.addEventListener('tap', showDialog);
+    window.dispatchEvent(new window.CustomEvent('notification-add', { detail:
+      { id: ++this._notificationId,
+        title: title,
+        text: message,
+        onsuccess: (function(notification) {
+          notification.addEventListener('tap', showDialog);
+        }).bind(this)
+      }
+    }));
+
   },
 
   playNotification: function cin_playNotification() {

diff --git a/apps/system/js/download/download_notification.js b/apps/system/js/download/download_notification.js
@@ -13,7 +13,9 @@ function DownloadNotification(download) {
   this.state = 'started';
   this.id = DownloadFormatter.getUUID(download);
 
-  NotificationScreen.addNotification(this._getInfo());
+  window.dispatchEvent(new window.CustomEvent('notification-add', {
+    detail: this._getInfo()
+  }));
 
   // We have to listen for state changes
   this.download.onstatechange = this._update.bind(this);
@@ -69,7 +71,9 @@ DownloadNotification.prototype = {
     if (noNotify) {
       info.noNotify = true;
     }
-    NotificationScreen.addNotification(info);
+    window.dispatchEvent(new window.CustomEvent('notification-add', {
+      detail: info
+    }));
     if (this.state === 'succeeded') {
       this._onSucceeded();
     }
@@ -200,7 +204,9 @@ DownloadNotification.prototype = {
    * Closes the notification
    */
   _close: function dn_close() {
-    NotificationScreen.removeNotification(this.id);
+    window.dispatchEvent(new window.CustomEvent('notification-remove', {
+      detail: this.id
+    }));
     this.onClose();
   },
 

diff --git a/apps/system/js/lockscreen.js b/apps/system/js/lockscreen.js
@@ -238,6 +238,19 @@
         window.removeEventListener('touchend', this);
         this.overlay.classList.remove('touched');
         break;
+      case 'lockscreen-notification-occur':
+        // when we have notifications, show bgcolor from wallpaper
+        // remove the simple gradient at the same time
+        this.maskedBackground.style.backgroundColor =
+          this.maskedBackground.dataset.wallpaperColor;
+
+        this.maskedBackground.classList.remove('blank');
+        break;
+      case 'lockscreen-notification-empty':
+        this.maskedBackground.style.backgroundColor =
+          'transparent';
+        this.maskedBackground.classList.add('blank');
+        break;
       case 'transitionend':
         if (evt.target !== this.overlay) {
           return;
@@ -412,6 +425,10 @@
 
     window.addEventListener('ftuopen', this);
 
+    /* to change the notification background color */
+    window.addEventListener('lockscreen-notification-occur', this);
+    window.addEventListener('lockscreen-notification-empty', this);
+
     /* mobile connection state on lock screen */
     if (window.navigator.mozMobileConnections) {
       this._lockscreenConnInfoManager =