diff options
Diffstat (limited to 'www/js/DataModel.js')
| -rw-r--r-- | www/js/DataModel.js | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/www/js/DataModel.js b/www/js/DataModel.js index e45829af..14864648 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -424,11 +424,6 @@ angular.module('zmApp.controllers') loginData.montageSize = 2; } - if (typeof loginData.useNphZms == 'undefined') - { - zmDebug ("useNphZms does not exist. Setting to true"); - loginData.useNphZms = true; - } if (typeof loginData.useNphZms == 'undefined') { @@ -436,8 +431,7 @@ angular.module('zmApp.controllers') loginData.useNphZms = true; } - // and now, force enable it - loginData.useNphZms = true; + if (typeof loginData.useNphZmsForEvents == 'undefined') { @@ -445,6 +439,10 @@ angular.module('zmApp.controllers') loginData.useNphZmsForEvents = true; } + // and now, force enable it + loginData.useNphZms = true; + loginData.useNphZmsForEvents = true; + if (typeof loginData.packMontage == 'undefined') { zmDebug ("packMontage does not exist. Setting to false"); @@ -511,7 +509,7 @@ angular.module('zmApp.controllers') if (typeof timelineModalGraphType == 'undefined') { zmDebug ("timeline graph type not set. Setting to all"); - loginData.timelineModalGraphType = 'all'; + loginData.timelineModalGraphType = $translate.instant('kAll'); } if (typeof loginData.resumeDelay == 'undefined') |