diff options
Diffstat (limited to 'www/js')
| -rwxr-xr-x | www/js/DataModel.js | 8 | ||||
| -rw-r--r-- | www/js/DevOptionsCtrl.js | 14 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 19 |
3 files changed, 34 insertions, 7 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 78d24772..b86c6f08 100755 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -177,6 +177,7 @@ angular.module('zmApp.controllers') 'disableSimulStreaming': false, 'insertBasicAuthToken': false, 'loginAPISupported': false, + 'montageResizeSteps': 5, }; @@ -1304,6 +1305,13 @@ angular.module('zmApp.controllers') } + if (typeof loginData.montageResizeSteps == 'undefined') { + + loginData.montageResizeSteps = 5; + + } + + loginData.canSwipeMonitors = true; loginData.forceImageModePath = false; loginData.enableBlog = true; diff --git a/www/js/DevOptionsCtrl.js b/www/js/DevOptionsCtrl.js index 1ee85904..7d50aa4e 100644 --- a/www/js/DevOptionsCtrl.js +++ b/www/js/DevOptionsCtrl.js @@ -96,6 +96,20 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope' } + // make sure only ints are used as CSS classes only use ints + // in grid scale + $scope.loginData.montageResizeSteps = parseInt($scope.loginData.montageResizeSteps); + + if ($scope.loginData.montageResizeSteps < 1) { + $scope.loginData.montageResizeSteps = 1; + + } + + if ($scope.loginData.montageResizeSteps > 50) { + $scope.loginData.montageResizeSteps = 50; + + } + if ((parseInt($scope.loginData.montageQuality) < zm.safeMontageLimit) || (parseInt($scope.loginData.montageQuality) > 100)) { $scope.loginData.montageQuality = 100; diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index b2021920..ee34a1b3 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -286,10 +286,11 @@ angular.module('zmApp.controllers') pckry = new Packery('.grid', { itemSelector: '.grid-item', percentPosition: true, - columnWidth: '.grid-sizer', + //columnWidth: '.grid-sizer', gutter: 0, initLayout: layouttype, - shiftPercentResize: true + shiftPercentResize: true, + transitionDuration: 0 }); @@ -2054,6 +2055,7 @@ angular.module('zmApp.controllers') } $scope.sliderChanging = true; + var ld = NVRDataModel.getLogin(); $ionicLoading.show({ template: $translate.instant('kPleaseWait'), @@ -2077,7 +2079,7 @@ angular.module('zmApp.controllers') for (var i = 0; i < $scope.MontageMonitors.length; i++) { var curVal = parseInt($scope.MontageMonitors[i].Monitor.gridScale) || 20; - curVal = curVal + (5 * dirn); + curVal = curVal + (ld.montageResizeSteps * dirn); if (curVal < 10) curVal = 10; if (curVal > 100) curVal = 100; //console.log ("For Index: " + i + " From: " + $scope.MontageMonitors[i].Monitor.gridScale + " To: " + curVal); @@ -2102,7 +2104,7 @@ angular.module('zmApp.controllers') { for (i = 0; i < $scope.MontageMonitors.length; i++) { var cv = parseInt($scope.MontageMonitors[i].Monitor.gridScale) || 20; - cv = cv + (5 * dirn); + cv = cv + (ld.montageResizeSteps * dirn); if (cv < 10) cv = 10; if (cv > 100) cv = 100; $scope.MontageMonitors[i].Monitor.gridScale = cv; @@ -2118,7 +2120,10 @@ angular.module('zmApp.controllers') if (dirn == 1) //expand { - pckry.getItemElements().forEach(function (elem) { + pckry.once('layoutComplete', resizeComplete); + pckry.layout(); + + /* pckry.getItemElements().forEach(function (elem) { var id = elem.getAttribute("data-item-id"); var sz = elem.getAttribute("data-item-size"); if (isNaN(sz)) sz = 20; @@ -2129,7 +2134,7 @@ angular.module('zmApp.controllers') pckry.fit(elem); } - }); + });*/ } else //shrink { //console.log("Calling shift"); @@ -2138,7 +2143,7 @@ angular.module('zmApp.controllers') } - }, 20); + }, 150); /* if (!somethingReset) { //console.log (">>>SOMETHING NOT RESET"); |