summaryrefslogtreecommitdiff
path: root/www/js/DataModel.js
diff options
context:
space:
mode:
authorpliablepixels <pliablepixels@gmail.com>2016-02-25 09:58:14 -0500
committerpliablepixels <pliablepixels@gmail.com>2016-02-25 09:58:14 -0500
commit311343f481c7223238d96ce1593b9cb62d04ea2d (patch)
tree574c2243ca0cfd00d09dcb3a35290e96f4c1f9d4 /www/js/DataModel.js
parente635bf9b5d9c9e3c8f5e3607b4b0fe01d32478cf (diff)
managed code to not call window.stop immediately upon resume as we already call it on pause
Former-commit-id: 0662346ff6149596afb7943e3dc5c45e4a08deea
Diffstat (limited to 'www/js/DataModel.js')
-rw-r--r--www/js/DataModel.js21
1 files changed, 21 insertions, 0 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index 0e8fe1ec..1b6b5c81 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -19,6 +19,7 @@ angular.module('zmApp.controllers')
var zmAppVersion="unknown";
var isBackground = false;
+ var justResumed = false;
var monitorsLoaded = 0;
//var montageSize = 3;
var monitors = [];
@@ -309,6 +310,26 @@ angular.module('zmApp.controllers')
{
return loginData.forceNetworkStop;
},
+
+ setJustResumed: function (val)
+ {
+ justResumed = true;
+ },
+
+ stopNetwork: function()
+ {
+ if (justResumed)
+ {
+ // we don't call stop as we did stop on pause
+ zmLog ("Not calling window stop as we just resumed");
+ justResumed = false;
+ }
+ else
+ {
+ zmLog ("Calling window.stop()");
+ window.stop();
+ }
+ },
isLoggedIn: function () {