diff options
Diffstat (limited to 'www/js/DataModel.js')
| -rw-r--r-- | www/js/DataModel.js | 29 |
1 files changed, 28 insertions, 1 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 02c719ed..6c9b806c 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -121,6 +121,7 @@ angular.module('zmApp.controllers') 'enableBlog': true, 'use24hr': false, 'packeryPositions': '', + 'currentMontageProfile': '', 'packeryPositionsArray': {}, 'EHpackeryPositions': '', 'packerySizes': '', @@ -133,6 +134,8 @@ angular.module('zmApp.controllers') 'vibrateOnPush': true, 'soundOnPush': true, 'cycleMonitors': false, + 'cycleMontage': false, + 'cycleMontageInterval': 10, // 10sec 'cycleMonitorsInterval': 10, // 10sec 'enableLowBandwidth': false, 'autoSwitchBandwidth': false, @@ -262,8 +265,11 @@ angular.module('zmApp.controllers') var positionsStr = loginData.packeryPositions; //console.log ("positionStr="+positionsStr); var positions = {}; - if (loginData.packeryPositions != '') + if (loginData.packeryPositions != '' && loginData.packeryPositions != undefined) { + console.log ("positions="+loginData.packeryPositions); + + positions = JSON.parse(positionsStr); for (var m = 0; m < monitors.length; m++) { @@ -861,6 +867,20 @@ angular.module('zmApp.controllers') } + if (typeof loginData.cycleMontage == 'undefined') + { + + loginData.cycleMontage = false; + + } + + if (typeof loginData.cycleMontageInterval == 'undefined') + { + + loginData.cycleMontageInterval = 10; + + } + if (typeof loginData.enableLowBandwidth == 'undefined') { @@ -908,6 +928,13 @@ angular.module('zmApp.controllers') } + if (typeof loginData.currentMontageProfile == 'undefined') + { + + loginData.currentMontageProfile = ''; + + } + if (typeof loginData.followTimeLine == 'undefined') { |