From de1ca2862300d2adfd03c095e69cfe1a5d1cec9a Mon Sep 17 00:00:00 2001 From: Seth Call Date: Thu, 3 Jul 2014 16:24:24 -0500 Subject: [PATCH] * VRFS-1680 - incorporate LeaveSessionAndMinimize bridge call on 'background' selection --- web/app/assets/javascripts/banner.js | 3 +++ web/app/assets/javascripts/fakeJamClient.js | 6 +++--- web/app/assets/javascripts/shutdownDialog.js | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/web/app/assets/javascripts/banner.js b/web/app/assets/javascripts/banner.js index 863e5dd98..b64fda123 100644 --- a/web/app/assets/javascripts/banner.js +++ b/web/app/assets/javascripts/banner.js @@ -57,6 +57,8 @@ } } + hide(); + logger.debug("opening banner:" + options.title); var $h1 = $banner.find('h1'); @@ -74,6 +76,7 @@ } + if((options.type == "alert" && !options.buttons) || options.close) { var closeButtonText = 'CLOSE'; diff --git a/web/app/assets/javascripts/fakeJamClient.js b/web/app/assets/javascripts/fakeJamClient.js index af144dfd6..13da1b672 100644 --- a/web/app/assets/javascripts/fakeJamClient.js +++ b/web/app/assets/javascripts/fakeJamClient.js @@ -774,9 +774,8 @@ logger.debug("SessionLiveBroadcastStop requested"); } - function RegisterQuitCallback() { - - } + function RegisterQuitCallback() { } + function LeaveSessionAndMinimize() {} // Javascript Bridge seems to camel-case // Set the instance functions: @@ -809,6 +808,7 @@ this.SetNetworkTestScore = SetNetworkTestScore; this.GetNetworkTestScore = GetNetworkTestScore; this.RegisterQuitCallback = RegisterQuitCallback; + this.LeaveSessionAndMinimize = LeaveSessionAndMinimize; this.connected = true; // FTUE (round 3) diff --git a/web/app/assets/javascripts/shutdownDialog.js b/web/app/assets/javascripts/shutdownDialog.js index 60c837861..9cd1ec082 100644 --- a/web/app/assets/javascripts/shutdownDialog.js +++ b/web/app/assets/javascripts/shutdownDialog.js @@ -14,6 +14,7 @@ {name: 'Completely Shut Down the App', click: function() {context.jamClient.ShutdownApplication()}}, {name: 'Let App Run in Background', click: function() { context.jamClient.RegisterQuitCallback("window.JK.ShutdownDialogCallback"); + context.jamClient.LeaveSessionAndMinimize(); context.JK.Banner.hide(); } }