undo squeeze, just don't call it in layout

ZoneMinder · Jun 17, 2019 · ad4f8b8 · ad4f8b8
1 parent 157a366
commit ad4f8b8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git 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 @@
       ]
     }
   }
-}
+}
diff --git 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() {