Merge pull request #23304 from luke-chang/1056493_v1.4_contacts_to_ho…

…mescreen_delay Bug 1056493 - [Dolphin][Hamachi][v1.4]No icons show for several seconds when back to homescreen from contacts, r=alive
mozilla-b2g · Sep 4, 2014 · dd96036 · dd96036
1 parent 13978cf
commit dd96036
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/apps/system/js/browser_frame.js b/apps/system/js/browser_frame.js
@@ -52,8 +52,10 @@
       browser.setAttribute('mozapp', config.manifestURL);
 
       // Only app with manifest could get system message.
-      browser.setAttribute('expecting-system-message',
-                            'expecting-system-message');
+      if (config.isSystemMessage) {
+        browser.setAttribute('expecting-system-message',
+                             'expecting-system-message');
+      }
     }
 
     if (config.parentApp) {

diff --git a/apps/system/test/unit/browser_frame_test.js b/apps/system/test/unit/browser_frame_test.js
@@ -49,6 +49,7 @@ suite('browser class > ', function() {
 
   test('expect system message', function() {
     var b = new BrowserFrame({
+      isSystemMessage: true,
       url: window.location.protocol + '//' + 'other.gaiamobile.org',
       manifestURL: window.location.protocol +
         '//' + 'other.gaiamobile.org/manifest.webapp'
@@ -57,9 +58,17 @@ suite('browser class > ', function() {
       'expecting-system-message');
 
     var b2 = new BrowserFrame({
-      url: window.location.protocol + '//' + 'other.gaiamobile.org'
+      url: window.location.protocol + '//' + 'other.gaiamobile.org',
+      manifestURL: window.location.protocol +
+        '//' + 'other.gaiamobile.org/manifest.webapp'
     });
     assert.isNull(b2.element.getAttribute('expecting-system-message'));
+
+    var b3 = new BrowserFrame({
+      isSystemMessage: true,
+      url: window.location.protocol + '//' + 'other.gaiamobile.org'
+    });
+    assert.isNull(b3.element.getAttribute('expecting-system-message'));
   });
 });