Merge pull request #5820 from alivedise/bugzilla/800689/modal-dialog-…

…with-inline-activity

Bug 800689 - Support modal dialogs (alert/prompt/confirm) from inline activity frames

apps/system/js/modal_dialog.js

@@ -58,6 +58,8 @@ var ModalDialog = {
     window.addEventListener('resize', this);
     window.addEventListener('keyboardchange', this);
     window.addEventListener('keyboardhide', this);
+    window.addEventListener('home', this);
+    window.addEventListener('holdhome', this);
 
     for (var id in elements) {
       var tagName = elements[id].tagName.toLowerCase();
@@ -73,7 +75,8 @@ var ModalDialog = {
     switch (evt.type) {
       case 'mozbrowsererror':
       case 'mozbrowsershowmodalprompt':
-        if (evt.target.dataset.frameType != 'window')
+        var frameType = evt.target.dataset.frameType;
+        if (frameType != 'window' && frameType != 'inline-activity')
           return;
 
         /* fatal case (App crashing) is handled in Window Manager */
@@ -86,7 +89,8 @@ var ModalDialog = {
 
         // Show modal dialog only if
         // the frame is currently displayed.
-        if (origin == WindowManager.getDisplayedApp())
+        if (origin == WindowManager.getDisplayedApp() ||
+            frameType == 'inline-activity')
           this.show(origin);
         break;
 
@@ -112,6 +116,14 @@ var ModalDialog = {
         this.show(evt.detail.origin);
         break;
 
+      case 'home':
+      case 'holdhome':
+        // Inline activity, which origin is different from foreground app
+        if (this.isVisible() && 
+            this.currentOrigin != WindowManager.getDisplayedApp())
+          this.cancelHandler();
+        break;
+
       case 'appwillclose':
         // Do nothing if the app is closed at background.
         if (evt.detail.origin !== this.currentOrigin)

test_apps/test-receiver-inline/index.html

@@ -91,5 +91,6 @@ <h1>Inline Web Activities receiver</h1>
     <!-- add an input field to test keyboard work well -->
     <p><input type="number" id="number" size="4" /></p>
     <p><button onclick="cancel()" disabled id="cancelButton">Cancel</button></p>
+    <p><button onclick="prompt('inline-activty prompt!');">Prompt</button></p>
   </body>
 </html>