diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2018-04-05 15:37:52 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2018-04-05 15:37:52 -0400 |
| commit | b39eae4b52c199c30c3c7489382403057f12d93c (patch) | |
| tree | f3e7b1368ea2d149abc362be3668fa0409d4a2e6 /www/js/MontageHistoryCtrl.js | |
| parent | f2619f2c04203ac3a56bf0ac914149df5616ef49 (diff) | |
#602 support
Diffstat (limited to 'www/js/MontageHistoryCtrl.js')
| -rw-r--r-- | www/js/MontageHistoryCtrl.js | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js index 67b48707..c9f78499 100644 --- a/www/js/MontageHistoryCtrl.js +++ b/www/js/MontageHistoryCtrl.js @@ -898,6 +898,7 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc });*/ $scope.$on('$ionicView.beforeEnter', function() { + $scope.isMultiPort = NVRDataModel.getCurrentServerMultiPortSupported(); // NVRDataModel.log ("Before Enter History: initing connkeys"); }); $scope.$on('$ionicView.beforeLeave', function() @@ -1448,9 +1449,16 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc $scope.currentLimit = $scope.LoginData.maxMontage; if ($rootScope.platformOS != 'ios') { - NVRDataModel.log("Limiting montage to 5, thanks to Chrome's stupid connection limit"); - $scope.currentLimit = 5; - $scope.monLimit = 5; + if (!NVRDataModel.getCurrentServerMultiPortSupported()) { + NVRDataModel.log("Limiting montage to 5, thanks to Chrome's stupid connection limit"); + $scope.currentLimit = 5; + $scope.monLimit = 5; + } + else { + NVRDataModel.debug ("Since Multiport is supported, taking off Chrome limit!"); + } + + } $rootScope.authSession = "undefined"; $ionicLoading.show( |