Commit 217a9482 authored by Francisco Jordano's avatar Francisco Jordano
Browse files

Merge pull request #11197 from AntonioMA/bug-896945_2 

Bug 896945 Customize the open-app treatment based on the showApp and showOnly flags r=alive r=fabrice
parents 448b1fff 8cd172ed

apps/system/js/window_manager.js

+7 −2
Changes for apps/system/js/window_manager.js: 7 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -1344,6 +1344,9 @@ var WindowManager = (function() { 
          return;

        }



        // If the message specifies we only have to show the app,

        // then we don't have to do anything here

        if (!e.detail.onlyShowApp) {

          if (isRunning(origin)) {

            // If the app is in foreground, it's too risky to change it's

            // URL. We'll ignore this request.
@@ -1376,9 +1379,11 @@ var WindowManager = (function() { 
          } else {

            ensureHomescreen();

          }

        }



        // We will only bring web activity handling apps to the foreground

        if (!e.detail.isActivity)

        // We will only bring apps to the foreground when the message

        // specifically requests it.

        if (!e.detail.showApp)

          return;



        // XXX: the correct way would be for UtilityTray to close itself