From 856e977356f0a70839f323deef44671fb3f6f533 Mon Sep 17 00:00:00 2001
From: pliablepixels <pliablepixels@gmail.com>
Date: Sun, 6 Mar 2016 10:31:10 -0500
Subject: #175 - new option to enable/disable 24hr clock in Dev settings

Former-commit-id: 86fbef04eb4f75e4c4441fa7f57821cfe4d9bfe1
---
 www/js/DataModel.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'www/js/DataModel.js')

diff --git a/www/js/DataModel.js b/www/js/DataModel.js
index 1b6b5c81..814c87ff 100644
--- a/www/js/DataModel.js
+++ b/www/js/DataModel.js
@@ -70,6 +70,7 @@ angular.module('zmApp.controllers')
          'forceNetworkStop':false,
          'defaultPushSound': false,
          'enableBlog':true,
+         'use24hr':false,
          
         
     };
@@ -284,6 +285,13 @@ angular.module('zmApp.controllers')
                     
                 }
                 
+                if (typeof loginData.use24hr == 'undefined')
+                {
+                    zmDebug ("use24hr does not exist. Setting to false");
+                    loginData.use24hr  = false;
+                    
+                }
+                
                 if (typeof loginData.montageHistoryQuality == 'undefined')
                 {
                     zmDebug ("montageHistoryQuality does not exist. Setting to 50");
@@ -395,7 +403,10 @@ angular.module('zmApp.controllers')
             
         },
 
-
+        getTimeFormat: function()
+        {
+            return (loginData.use24hr ? "HH:mm": "hh:mm a");
+        },
 
         //------------------------------------------------------------------
         // switches screen to 'always on' or 'auto'
-- 
cgit v1.2.3