Merge pull request #8315 from alivedise/bugzilla/844168_v1.0.1/delaye…

…d-window-open Bug 844168 - Don't rely locationchange event to show popup, r=timdream, a=blocking-b2g:tef+
mozilla-b2g · Feb 26, 2013 · cf4b08a · cf4b08a
2 parents af57b9c + 0b213c7
commit cf4b08a
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/apps/system/js/popup_manager.js b/apps/system/js/popup_manager.js
@@ -67,6 +67,10 @@ var PopupManager = {
     // this seems needed, or an override to origin in close()
     this._currentOrigin = origin;
 
+    if (WindowManager.getDisplayedApp() == origin) {
+      this.screen.classList.add('popup');
+    }
+
     this.container.appendChild(popup);
 
     popup.addEventListener('mozbrowsererror', this);
@@ -146,7 +150,7 @@ var PopupManager = {
         if (WindowManager.getDisplayedApp() !== evt.target.dataset.frameOrigin)
           return;
 
-        this.show();
+        this.title.textContent = this.getTitleFromUrl(popup.dataset.url);
         break;
 
       case 'mozbrowsererror':