diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2019-06-17 13:17:18 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2019-06-17 13:17:18 -0400 |
| commit | f7a0ac135408bf4da725d519bb4d32731c94e65f (patch) | |
| tree | c25d98aff235c1d46ef8e26ac740afa1037c787f | |
| parent | 129d6c3eaeab66f9813fc637728cde1dd08bcff9 (diff) | |
undo squeeze, just don't call it in layout
| -rw-r--r-- | package.json | 4 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 10 |
2 files changed, 8 insertions, 6 deletions
diff --git a/package.json b/package.json index 11a708d2..f97e964f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "zmninjapro", "description": "Home security mobile app for ZoneMinder", - "version": "1.3.062", + "version":"1.3.062", "displayName": "zmNinja", "author": "Pliable Pixels", "license": "custom see LICENSE.md", @@ -185,4 +185,4 @@ ] } } -}
\ No newline at end of file +} diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index 2ce7c217..d9b1a807 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -442,7 +442,8 @@ angular.module('zmApp.controllers') $timeout(function () { NVR.debug("doing the jiggle and dance..."); pckry.resize(true); - $scope.squeezeMonitors(); + pckry.shiftLayout(); + //$scope.squeezeMonitors(); }, 500); }, 100); @@ -2106,7 +2107,8 @@ angular.module('zmApp.controllers') monitor.Monitor.showSidebar = !monitor.Monitor.showSidebar; $timeout (function() { - $scope.squeezeMonitors(); + pckry.shiftLayout(); + // $scope.squeezeMonitors(); }, 300); }; @@ -2415,7 +2417,7 @@ angular.module('zmApp.controllers') NVR.debug("doing the jiggle and dance..."); pckry.resize(true); pckry.shiftLayout(); - $scope.squeezeMonitors(); + //$scope.squeezeMonitors(); }, 600); @@ -2455,7 +2457,7 @@ angular.module('zmApp.controllers') NVR.debug ("squeezing"); pckry.once('layoutComplete', resizeComplete); $timeout(function () { - pckry.shiftLayout(); + pckry.layout(); }); function resizeComplete() { |