#179 - delete packery layout if monitor count changes - this makes layout unpredictable

Former-commit-id: a3b2ae5ba914aea94464913efc361b1d727dda38

2 files changed, 14 insertions, 0 deletions

diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index 29e77d53..f0930637 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -202,6 +202,14 @@ function initPackery()
             ZMDataModel.zmLog ("found a packery layout");
             layouttype = false;
         }
+    
+    if ($scope.MontageMonitors.length != positions.length)
+    {
+        ZMDataModel.zmLog ("Monitors found:"+$scope.MontageMonitors.length+" but layout says:"+positions.length);
+        ZMDataModel.zmLog ("Whoops!! Monitors have changed. I'm resetting layouts, sorry!");
+        layouttype = true;
+        positions = {};
+    }
         
         var elem =  angular.element(document.getElementById("mygrid"));
         pckry = new Packery('.grid', 
diff --git a/www/js/MontageHistoryCtrl.js b/www/js/MontageHistoryCtrl.js
index 0cf4462b..bc5cbf5b 100644
--- a/www/js/MontageHistoryCtrl.js
+++ b/www/js/MontageHistoryCtrl.js
@@ -476,9 +476,15 @@ angular.module('zmApp.controllers').controller('zmApp.MontageHistoryCtrl', ['$sc
     document.addEventListener("pause", onPause, false);
     document.addEventListener("resume", onResume, false);
     
+    $scope.timeFormat = "yyyy-MM-dd "+ZMDataModel.getTimeFormat();
     $scope.displayDateTimeSliders = true;
     $scope.showtimers = true;
+    $scope.loginData = ZMDataModel.getLogin();
+
+     
+    
     var curYear = new Date().getFullYear();
+    
     var readyToRun = false;
     var i;