From f7a0ac135408bf4da725d519bb4d32731c94e65f Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
Date: Mon, 17 Jun 2019 13:17:18 -0400
Subject: undo squeeze, just don't call it in layout

---
 www/js/MontageCtrl.js | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'www')

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() {
-- 
cgit v1.2.3