Bug 894196 - [CB] Disapper the title background alert and need to dis…

…play channel info
mozilla-b2g · Jul 16, 2013 · 124efab · 124efab
1 parent fcda94c
commit 124efab
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/apps/system/js/cell_broadcast_system.js b/apps/system/js/cell_broadcast_system.js
@@ -41,7 +41,7 @@ var CellBroadcastSystem = {
       return;
     }
 
-    var title = navigator.mozL10n.get('system-alert');
+    var title = navigator.mozL10n.get('cb-channel', {channel: msg.messageId});
     var showDialog = function() {
       ModalDialog.showWithPseudoEvent({
         title: title,

diff --git a/apps/system/js/modal_dialog.js b/apps/system/js/modal_dialog.js
@@ -184,6 +184,7 @@ var ModalDialog = {
     var evt = this.eventForCurrentOrigin;
 
     var message = evt.detail.message || '';
+    var title = evt.detail.title || '';
     var elements = this.elements;
     this.screen.classList.add('modal-dialog');
 
@@ -205,7 +206,7 @@ var ModalDialog = {
       case 'alert':
         elements.alertMessage.innerHTML = message;
         elements.alert.classList.add('visible');
-        this.setTitle('alert', '');
+        this.setTitle('alert', title);
         elements.alertOk.textContent = evt.yesText ? evt.yesText : _('ok');
         elements.alert.focus();
         break;
@@ -448,6 +449,7 @@ var ModalDialog = {
       }
     };
 
+    pseudoEvt.detail.title = config.title;
     pseudoEvt.detail.message = config.text;
     pseudoEvt.callback = config.callback;
     pseudoEvt.detail.promptType = config.type;
@@ -465,8 +467,6 @@ var ModalDialog = {
     }
     this.currentEvents['system'].push(pseudoEvt);
     this.show(null, 'system');
-    if (config.title)
-      this.setTitle(config.type, config.title);
   },
 
   isVisible: function md_isVisible() {

diff --git a/apps/system/locales/system.en-US.properties b/apps/system/locales/system.en-US.properties
@@ -340,6 +340,7 @@ unknown-free-space=Unknown remaining space.
 
 # Cell Broadcast System
 system-alert=System Alert
+cb-channel=Channel {{channel}}
 
 # ICC / STK
 icc-message=Operator message