summaryrefslogtreecommitdiff
path: root/www/js/MontageCtrl.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/MontageCtrl.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/MontageCtrl.js')
-rw-r--r--www/js/MontageCtrl.js4
1 files changed, 2 insertions, 2 deletions
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();
});