summaryrefslogtreecommitdiff
path: root/www/js/app.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/app.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/app.js')
-rw-r--r--www/js/app.js5
1 files changed, 3 insertions, 2 deletions
diff --git a/www/js/app.js b/www/js/app.js
index f18bbef6..b96482e8 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -1157,15 +1157,16 @@ angular.module('zmApp', [
document.addEventListener("pause", function () {
ZMDataModel.setBackground(true);
+ ZMDataModel.setJustResumed(true); // used for window stop
ZMDataModel.zmLog("ROOT APP:App is going into background");
$interval.cancel($rootScope.eventQueryInterval);
$interval.cancel($rootScope.intervalHandle);
- ZMDataModel.setBackground(true);
+
ZMDataModel.zmLog("ROOT APP: Stopping network pull...");
- window.stop();
+ window.stop(); // dont call stopNetwork - we need to stop here
var ld = ZMDataModel.getLogin();