From 311343f481c7223238d96ce1593b9cb62d04ea2d Mon Sep 17 00:00:00 2001 From: pliablepixels Date: Thu, 25 Feb 2016 09:58:14 -0500 Subject: managed code to not call window.stop immediately upon resume as we already call it on pause Former-commit-id: 0662346ff6149596afb7943e3dc5c45e4a08deea --- www/js/MontageCtrl.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'www/js/MontageCtrl.js') 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(); }); -- cgit v1.2.3