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/MonitorModalCtrl.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'www/js/MonitorModalCtrl.js') 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 -- cgit v1.2.3