summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--www/js/DataModel.js21
-rw-r--r--www/js/EventModalCtrl.js13
-rw-r--r--www/js/MonitorCtrl.js2
-rw-r--r--www/js/MonitorModalCtrl.js6
-rw-r--r--www/js/MontageCtrl.js4
-rw-r--r--www/js/MontageHistoryCtrl.js4
-rw-r--r--www/js/app.js5
7 files changed, 40 insertions, 15 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 () {
diff --git a/www/js/EventModalCtrl.js b/www/js/EventModalCtrl.js
index 19470fe0..67ed659e 100644
--- a/www/js/EventModalCtrl.js
+++ b/www/js/EventModalCtrl.js
@@ -91,7 +91,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
$rootScope.$on("auth-success", function () {
ZMDataModel.zmDebug("EventModalCtrl: Re-login detected, resetting everything & re-generating connkey");
- window.stop();
+ ZMDataModel.stopNetwork();
$scope.connKey = (Math.floor((Math.random() * 999999) + 1)).toString();
$timeout( function () { sendCommand('14',$scope.connKey, '&offset='+$scope.currentProgress);},500);
//$timeout.cancel(eventQueryHandle);
@@ -275,6 +275,9 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
// $interval.cancel(modalIntervalHandle);
// FIXME: Do I need to setAwake(false) here?
+ $interval.cancel(eventQueryHandle);
+ ZMDataModel.zmLog ("EventModalCtrl: paused, killing timer");
+
}
@@ -677,7 +680,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
$scope.$on('modal.removed', function () {
$scope.isModalActive = false;
- window.stop();
+ ZMDataModel.stopNetwork();
//console.log("**MODAL REMOVED: Stopping modal timer");
$interval.cancel(eventQueryHandle);
//$timeout.cancel(eventQueryHandle);
@@ -782,7 +785,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
ZMDataModel.setLogin($scope.loginData);
ZMDataModel.zmDebug("EventModalCtrl: gapless has changed resetting everything & re-generating connkey");
- window.stop();
+ ZMDataModel.stopNetwork();
$scope.connKey = (Math.floor((Math.random() * 999999) + 1)).toString();
$timeout( function () { sendCommand('14',$scope.connKey, '&offset='+$scope.currentProgress);},500);
//$timeout.cancel(eventQueryHandle);
@@ -927,7 +930,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
function outWithOld() {
ZMDataModel.zmLog("ModalCtrl:Stopping network pull...");
- window.stop();
+ ZMDataModel.stopNetwork();
$scope.animationInProgress = true;
// give digest time for image to swap
// 100 should be enough
@@ -971,7 +974,7 @@ angular.module('zmApp.controllers').controller('EventModalCtrl', ['$scope', '$ro
function (error) {
ZMDataModel.zmDebug("Hmm jump error " + JSON.stringify(error));
- window.stop();
+ ZMDataModel.stopNetwork();
$scope.connKey = (Math.floor((Math.random() * 999999) + 1)).toString();
$timeout( function () { sendCommand('14',$scope.connKey, '&offset='+$scope.currentProgress);},500);
ZMDataModel.zmDebug ("so I'm regenerating Connkey to " + $scope.connKey);
diff --git a/www/js/MonitorCtrl.js b/www/js/MonitorCtrl.js
index 555f8eb0..9db218cc 100644
--- a/www/js/MonitorCtrl.js
+++ b/www/js/MonitorCtrl.js
@@ -405,7 +405,7 @@ angular.module('zmApp.controllers')
// switch off awake, as liveview is finished
ZMDataModel.setAwake(false);
$scope.modal.remove();
- $timeout (function() {ZMDataModel.zmLog("MonitorCtrl:Stopping network pull...");if (ZMDataModel.isForceNetworkStop()) window.stop();},50);
+ $timeout (function() {ZMDataModel.zmLog("MonitorCtrl:Stopping network pull...");if (ZMDataModel.isForceNetworkStop()) ZMDataModel.stopNetwork();},50);
};
diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js
index dc34372a..7a3841eb 100644
--- a/www/js/MonitorModalCtrl.js
+++ b/www/js/MonitorModalCtrl.js
@@ -110,7 +110,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
$rootScope.$on("auth-success", function () {
ZMDataModel.zmDebug("MonitorModalCtrl: Re-login detected, resetting everything & re-generating connkey");
- window.stop();
+ ZMDataModel.stopNetwork();
$scope.connKey = (Math.floor((Math.random() * 999999) + 1)).toString();
@@ -743,7 +743,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
function outWithOld() {
ZMDataModel.zmLog("ModalCtrl:Stopping network pull...");
- window.stop();
+ ZMDataModel.stopNetwork();
$scope.rand = Math.floor((Math.random() * 100000) + 1);
$scope.animationInProgress = true;
@@ -1285,7 +1285,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
function outWithOld() {
ZMDataModel.zmLog("ModalCtrl:Stopping network pull...");
- window.stop();
+ ZMDataModel.stopNetwork();
$scope.animationInProgress = true;
// give digest time for image to swap
// 100 should be enough
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index 5102068e..b51d1d6a 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -686,7 +686,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
$scope.modal.remove();
- $timeout (function() {ZMDataModel.zmLog("MontageCtrl:Stopping network pull...");if (ZMDataModel.isForceNetworkStop()) window.stop();},50);
+ $timeout (function() {ZMDataModel.zmLog("MontageCtrl:Stopping network pull...");if (ZMDataModel.isForceNetworkStop()) ZMDataModel.stopNetwork();},50);
$rootScope.rand = Math.floor((Math.random() * 100000) + 1);
$scope.isModalActive = false;
@@ -860,7 +860,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageCtrl', ['$scope', '
// make sure this is applied in scope digest to stop network pull
// thats why we are doing it beforeLeave
- if (ZMDataModel.isForceNetworkStop()) window.stop();
+ if (ZMDataModel.isForceNetworkStop()) ZMDataModel.stopNetwork();
});
diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js
index 0440f4bd..d733e9f7 100644
--- a/www/js/MontageHistoryCtrl.js
+++ b/www/js/MontageHistoryCtrl.js
@@ -90,7 +90,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
return;
}
- window.stop();
+ ZMDataModel.stopNetwork();
var ld = ZMDataModel.getLogin();
$scope.sliderVal.realRate = $scope.sliderVal.rate *100;
@@ -1248,7 +1248,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
}
ZMDataModel.zmLog ("Forcing a window.stop() here");
- window.stop();
+ ZMDataModel.stopNetwork();
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();
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-06 20:24:43 +0000