diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-04-13 16:08:34 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-04-13 16:08:34 -0400 |
| commit | dfc6c17dfba485a642c1ffee22a7bb02e8b149b9 (patch) | |
| tree | f6308cc2790e4132624532e88a8c6a28a8945573 | |
| parent | 950b67f5017802b129d80352708205dfe63080eb (diff) | |
#606 auth session doesn't need to be regnerated in modal
| -rw-r--r-- | www/js/MonitorModalCtrl.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js index d346a210..ab59a147 100644 --- a/www/js/MonitorModalCtrl.js +++ b/www/js/MonitorModalCtrl.js @@ -32,7 +32,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ }, false); - $rootScope.authSession = "undefined"; + //$rootScope.authSession = "undefined"; $ionicLoading.show({ template: $translate.instant('kNegotiatingStreamAuth') + '...', @@ -49,7 +49,8 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ NVRDataModel.debug("MonitorModalCtrl called from " + $ionicHistory.currentStateName()); - $rootScope.validMonitorId = $scope.monitors[0].Monitor.Id; + //no need to recompute auth in modal + /*$rootScope.validMonitorId = $scope.monitors[0].Monitor.Id; NVRDataModel.getAuthKey($rootScope.validMonitorId, $scope.monitors[0].Monitor.connKey) .then(function (success) { $ionicLoading.hide(); @@ -64,7 +65,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ //$rootScope.authSession=""; NVRDataModel.log("Modal: Error returned Stream authentication construction. Retaining old value of: " + $rootScope.authSession); }); - +*/ $interval.cancel(intervalModalHandle); $interval.cancel(cycleHandle); @@ -1144,7 +1145,7 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$ function appendSingleStreamConnKey() { return $scope.isModalStreamPaused ? "": "&connkey="+$scope.connKey; - }; + } //------------------------------------------------------------- //reloaads mon - do we need it? |