diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-04-08 12:12:04 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-04-08 12:12:04 -0400 |
| commit | 0c42d61dd057d52d111c06cb1f72a056c330e263 (patch) | |
| tree | b08899265a933059b14c98184aab72bfbe8036f5 /www/js/MontageHistoryCtrl.js | |
| parent | c667a1dd0f0f881e6a4c022e31ee75cbe12ef876 (diff) | |
take off iOS assumption - seems even safari allows 6
Diffstat (limited to 'www/js/MontageHistoryCtrl.js')
| -rw-r--r-- | www/js/MontageHistoryCtrl.js | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js index 111073f0..6c8c3cf2 100644 --- a/www/js/MontageHistoryCtrl.js +++ b/www/js/MontageHistoryCtrl.js @@ -900,7 +900,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc });*/ $scope.$on('$ionicView.beforeEnter', function() { - $scope.isSimulStreaming = ($rootScope.platformOS == 'ios') ? true: NVRDataModel.getCurrentServerMultiPortSupported(); + $scope.isSimulStreaming = NVRDataModel.getCurrentServerMultiPortSupported(); NVRDataModel.regenConnKeys(); // NVRDataModel.log ("Before Enter History: initing connkeys"); @@ -1431,13 +1431,11 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc if (!$scope.isSimulStreaming) { - NVRDataModel.log("Limiting montage to 5, thanks to Chrome's stupid connection limit"); + NVRDataModel.log("Limiting montage to 5, thanks to max connection per domain limit"); $scope.currentLimit = 5; $scope.monLimit = 5; } - else { - NVRDataModel.debug ("Since Multiport is supported, or you are on iOS, taking off Chrome limit!"); - } + $rootScope.authSession = "undefined"; $ionicLoading.show( |