diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2016-07-09 11:53:26 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2016-07-09 11:53:26 -0400 |
| commit | 7be4525b17b6b5a8cd6c56d60ff78db4fe3c0c43 (patch) | |
| tree | c7b587e4f882100126a9cb7e766ccab1dde9b057 /www/js | |
| parent | e4abd194a26931c741338af1b24aa3ced0153858 (diff) | |
something odd is going on with onTap and old values, doing a bit of overriding here
Former-commit-id: 6bfbc12f72141360e50d4a70bfa30c33342b8781
Diffstat (limited to 'www/js')
| -rw-r--r-- | www/js/DataModel.js | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 28357500..bc0b5a9a 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -66,7 +66,7 @@ angular.module('zmApp.controllers') 'pinCode': '', 'canSwipeMonitors': true, 'persistMontageOrder': false, - 'onTapScreen': $translate.instant('kTapEvents'), + 'onTapScreen': "", 'enableh264': true, 'gapless': false, 'montageOrder': '', @@ -365,7 +365,7 @@ angular.module('zmApp.controllers') serverGroupList = $localstorage.getObject("serverGroupList"); - var demoServer = "{\"serverName\":\"zmNinjaDemo\",\"username\":\"zmninja\",\"password\":\"zmNinja$xc129\",\"url\":\"https://demo.zoneminder.com/zm\",\"apiurl\":\"https://demo.zoneminder.com/zm/api\",\"eventServer\":\"\",\"maxMontage\":\"40\",\"streamingurl\":\"https://demo.zoneminder.com/cgi-bin-zm\",\"maxFPS\":\"3\",\"montageQuality\":\"50\",\"singleImageQuality\":\"100\",\"montageHistoryQuality\":\"50\",\"useSSL\":true,\"keepAwake\":true,\"isUseAuth\":\"1\",\"isUseEventServer\":false,\"disablePush\":false,\"eventServerMonitors\":\"\",\"eventServerInterval\":\"\",\"refreshSec\":\"2\",\"enableDebug\":false,\"usePin\":false,\"pinCode\":\"\",\"canSwipeMonitors\":true,\"persistMontageOrder\":false,\"onTapScreen\":\"events\",\"enableh264\":true,\"gapless\":false,\"montageOrder\":\"\",\"montageHiddenOrder\":\"\",\"montageArraySize\":\"0\",\"graphSize\":2000,\"enableAlarmCount\":true,\"montageSize\":\"3\",\"useNphZms\":true,\"useNphZmsForEvents\":true,\"packMontage\":false,\"exitOnSleep\":false,\"forceNetworkStop\":false,\"defaultPushSound\":false,\"enableBlog\":true,\"use24hr\":false, \"packeryPositions\":\"\"}"; + var demoServer = "{\"serverName\":\"zmNinjaDemo\",\"username\":\"zmninja\",\"password\":\"zmNinja$xc129\",\"url\":\"https://demo.zoneminder.com/zm\",\"apiurl\":\"https://demo.zoneminder.com/zm/api\",\"eventServer\":\"\",\"maxMontage\":\"40\",\"streamingurl\":\"https://demo.zoneminder.com/cgi-bin-zm\",\"maxFPS\":\"3\",\"montageQuality\":\"50\",\"singleImageQuality\":\"100\",\"montageHistoryQuality\":\"50\",\"useSSL\":true,\"keepAwake\":true,\"isUseAuth\":\"1\",\"isUseEventServer\":false,\"disablePush\":false,\"eventServerMonitors\":\"\",\"eventServerInterval\":\"\",\"refreshSec\":\"2\",\"enableDebug\":false,\"usePin\":false,\"pinCode\":\"\",\"canSwipeMonitors\":true,\"persistMontageOrder\":false,\"onTapScreen\":\"Events\",\"enableh264\":true,\"gapless\":false,\"montageOrder\":\"\",\"montageHiddenOrder\":\"\",\"montageArraySize\":\"0\",\"graphSize\":2000,\"enableAlarmCount\":true,\"montageSize\":\"3\",\"useNphZms\":true,\"useNphZmsForEvents\":true,\"packMontage\":false,\"exitOnSleep\":false,\"forceNetworkStop\":false,\"defaultPushSound\":false,\"enableBlog\":true,\"use24hr\":false, \"packeryPositions\":\"\"}"; var demoS = JSON.parse(demoServer); console.log("JSON parsed demo" + JSON.stringify(demoS)); @@ -401,6 +401,20 @@ angular.module('zmApp.controllers') zmDebug("enableAlarmCount does not exist, setting to true"); loginData.enableAlarmCount = true; } + + if (typeof loginData.onTapScreen == 'undefined') + { + loginData.onTapScreen = $translate.instant('kTapMontage'); + } + + if (loginData.onTapScreen != $translate.instant('kTapMontage') && + loginData.onTapScreen != $translate.instant('kTapEvents') && + loginData.onTapScreen != $translate.instant('kTapLiveMonitor')) + { + zmLog ("Invalid onTap setting found, resetting"); + loginData.onTapScreen = $translate.instant('kMontage'); + } + if (typeof loginData.minAlarmCount === 'undefined') { zmDebug("minAlarmCount does not exist, setting to true"); |