From 330c3e948f8446661a1def0d4d8a2451484e4666 Mon Sep 17 00:00:00 2001
From: pliablepixels <pliablepixels@gmail.com>
Date: Thu, 10 Mar 2016 15:21:30 -0500
Subject: #179 - delete packery layout if monitor count changes - this makes
 layout unpredictable

Former-commit-id: a3b2ae5ba914aea94464913efc361b1d727dda38
---
 www/js/MontageCtrl.js              |  8 ++++++++
 www/js/MontageHistoryCtrl.js       |  6 ++++++
 www/templates/montage-history.html | 16 ++++++++--------
 3 files changed, 22 insertions(+), 8 deletions(-)

(limited to 'www')

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;
     
diff --git a/www/templates/montage-history.html b/www/templates/montage-history.html
index 35a8948b..7c57a9df 100644
--- a/www/templates/montage-history.html
+++ b/www/templates/montage-history.html
@@ -25,12 +25,12 @@
 
 
 
-        <div class="timeline_text" ion-datetime-picker title="From" am-pm ng-model="datetimeValueFrom.value" ng-change="dateChanged()">
-            <b>From: </b>{{datetimeValueFrom.value | date: "yyyy-MMM-dd hh:mma"}}
+        <div class="timeline_text" ion-datetime-picker title="From" ng-attr-am-pm="!loginData.use24hr" ng-model="datetimeValueFrom.value" ng-change="dateChanged()">
+            <b>From: </b>{{datetimeValueFrom.value | date: timeFormat}}
         </div>
 
-        <div class="timeline_text" ion-datetime-picker am-pm ng-model="datetimeValueTo.value" ng-change="dateChanged()">
-            <b>To: </b>{{datetimeValueTo.value | date: "yyyy-MMM-dd hh:mma"}} @ {{sliderVal.rate}}x
+        <div class="timeline_text" ion-datetime-picker ng-attr-am-pm="!loginData.use24hr" ng-model="datetimeValueTo.value" ng-change="dateChanged()">
+            <b>To: </b>{{datetimeValueTo.value | date: timeFormat}} @ {{sliderVal.rate}}x
             <div ng-if="$root.platformOS != 'ios'">(max of 5 monitors - chrome limit)</div>
         </div>
 
@@ -178,14 +178,14 @@
                 <div class="item item-divider">Timeline</div>
 
                 <ion-item>
-                    <div ion-datetime-picker title="From" am-pm ng-model="datetimeValueFrom.value">
-                        <b>From: </b>{{datetimeValueFrom.value | date: "MMM-dd-yyyy hh:mma"}}
+                    <div ion-datetime-picker title="From" ng-attr-am-pm="!loginData.use24hr" ng-model="datetimeValueFrom.value">
+                        <b>From: </b>{{datetimeValueFrom.value | date: timeFormat}}
                     </div>
                 </ion-item>
 
                 <ion-item>
-                    <div ion-datetime-picker am-pm ng-model="datetimeValueTo.value">
-                        <b>To: </b>{{datetimeValueTo.value | date: "MMM-dd-yyyy hh:mma"}}
+                    <div ion-datetime-picker ng-attr-am-pm="!loginData.use24hr" ng-model="datetimeValueTo.value">
+                        <b>To: </b>{{datetimeValueTo.value | date: timeFormat}}
                     </div>
                 </ion-item>
 
-- 
cgit v1.2.3