diff options
| author | pliablepixels <pliablepixels@gmail.com> | 2016-02-25 09:58:14 -0500 |
|---|---|---|
| committer | pliablepixels <pliablepixels@gmail.com> | 2016-02-25 09:58:14 -0500 |
| commit | 311343f481c7223238d96ce1593b9cb62d04ea2d (patch) | |
| tree | 574c2243ca0cfd00d09dcb3a35290e96f4c1f9d4 /www/js/MonitorModalCtrl.js | |
| parent | e635bf9b5d9c9e3c8f5e3607b4b0fe01d32478cf (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/MonitorModalCtrl.js')
| -rw-r--r-- | www/js/MonitorModalCtrl.js | 6 |
1 files changed, 3 insertions, 3 deletions
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 |
