From fc467d5b8306a8aa5b42f97b938899c6c07909aa Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Tue, 8 May 2018 11:15:48 -0400 Subject: no need for ng-checked with ng-model, also removed some old dev settings, enforced to true --- www/js/DataModel.js | 7 ++++ www/js/DevOptionsCtrl.js | 2 ++ www/js/EventCtrl.js | 1 + www/js/MonitorCtrl.js | 2 +- www/lang/locale-en.json | 2 +- www/templates/devoptions.html | 66 ++++++++++++---------------------- www/templates/events-modal.html | 3 +- www/templates/eventserversettings.html | 14 ++++---- www/templates/log.html | 2 +- www/templates/login.html | 8 ++--- www/templates/wizard.html | 6 ++-- 11 files changed, 49 insertions(+), 64 deletions(-) diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 97bbe4fd..8824d162 100755 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -981,6 +981,8 @@ angular.module('zmApp.controllers') debug("reachability does not exist. Setting to true"); loginData.reachability = true; } + + // force it - this may not be the problem loginData.reachability = true; @@ -1283,12 +1285,17 @@ angular.module('zmApp.controllers') loginData.showLiveForInProgressEvents = true; } + + loginData.canSwipeMonitors = true; + loginData.forceImageModePath = false; + loginData.enableBlog = true; log("DataModel init retrieved store loginData"); } else { log("defaultServer configuration NOT found. Keeping login at defaults"); } + //console.log ("LOGS="+JSON.stringify(loginData.enableLogs)); // now set up SSL - need to do it after data return // from local forage setSSLCerts(); diff --git a/www/js/DevOptionsCtrl.js b/www/js/DevOptionsCtrl.js index 9ae1ba39..9b4bd2c9 100644 --- a/www/js/DevOptionsCtrl.js +++ b/www/js/DevOptionsCtrl.js @@ -58,6 +58,8 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope' { //console.log("**VIEW ** DevOptions Ctrl Entered"); $scope.loginData = NVRDataModel.getLogin(); + console.log ("DEV LOGS="+$scope.loginData.enableLogs); + $scope.isMultiPort = false; NVRDataModel.getZmsMultiPortSupport() diff --git a/www/js/EventCtrl.js b/www/js/EventCtrl.js index be9e0665..c6427844 100644 --- a/www/js/EventCtrl.js +++ b/www/js/EventCtrl.js @@ -594,6 +594,7 @@ angular.module('zmApp.controllers') //console.log("***ERROR"); } + function saveNow(imgsrc, r, f) { diff --git a/www/js/MonitorCtrl.js b/www/js/MonitorCtrl.js index 74842c08..b41abfd0 100644 --- a/www/js/MonitorCtrl.js +++ b/www/js/MonitorCtrl.js @@ -150,7 +150,7 @@ angular.module('zmApp.controllers') $rootScope.zmPopup = $ionicPopup.show( { scope: $scope, - template: 'Enabled {{item.text}} ', + template: 'Enabled {{item.text}} ', title: $translate.instant('kChangeSettingsFor') + ' ' + monitorName, diff --git a/www/lang/locale-en.json b/www/lang/locale-en.json index 77961cfe..e394c483 100644 --- a/www/lang/locale-en.json +++ b/www/lang/locale-en.json @@ -65,7 +65,7 @@ "kDisableAlarmMontageSub" :"may help if server gets overloaded", "kDisableNative" :"Disable Native transitions", "kDisableNativeSub" :"Enable if the menu is freezing", - "kDisablePush" :"disable APNS/GCM", + "kDisablePush" :"disable FCM", "kDisableSamsung" :"If you are on a samsung device and are facing input issues, please temporarily disable auto-correction", "kDisableSimulStreaming" :"Ignore ZM 1.32.0 multi-port", "kDisableSimulStreamingNote" :"(disabling in iOS may cause issues)", diff --git a/www/templates/devoptions.html b/www/templates/devoptions.html index fb26a293..86c19561 100644 --- a/www/templates/devoptions.html +++ b/www/templates/devoptions.html @@ -18,36 +18,24 @@
- +
{{'kMaxMonitorsMontage' | translate }} 
+ + +
{{'kCycleMonitorsInterval'|translate}}({{'kSec'|translate}}.) 
- - - - - + + diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index 4cd1bf38..36810257 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -10,7 +10,7 @@
- +
@@ -26,6 +26,7 @@
+
diff --git a/www/templates/eventserversettings.html b/www/templates/eventserversettings.html index 02107ed6..1eff634b 100644 --- a/www/templates/eventserversettings.html +++ b/www/templates/eventserversettings.html @@ -11,7 +11,7 @@
{{'kEventServerConfig1' | translate }}
- {{'kUseEventServer' | translate}} + {{'kUseEventServer' | translate}} {{'kOnTapNavigate' | translate}}: {{defScreen}} @@ -19,16 +19,14 @@ {{'kEventServer' | translate}} - {{'kOnlyUseWebSocket'| translate }} + {{'kOnlyUseWebSocket'| translate }}

{{'kDisablePush' | translate }}

 - {{'kVibrateOnPush'| translate }} - {{'kSoundOnPush'| translate }} - + {{'kVibrateOnPush'| translate }} + {{'kSoundOnPush'| translate }} +
@@ -39,7 +37,7 @@ {{'kReportEvents' | translate }} diff --git a/www/templates/log.html b/www/templates/log.html index af5e345e..144ada6a 100644 --- a/www/templates/log.html +++ b/www/templates/log.html @@ -2,7 +2,7 @@ - +   diff --git a/www/templates/login.html b/www/templates/login.html index 60f6642e..cbd5a024 100644 --- a/www/templates/login.html +++ b/www/templates/login.html @@ -86,15 +86,13 @@
- +
diff --git a/www/templates/wizard.html b/www/templates/wizard.html index 872dc7fb..7c6dc887 100644 --- a/www/templates/wizard.html +++ b/www/templates/wizard.html @@ -28,8 +28,8 @@

{{'kWizPortalAuth' | translate}}

{{'kWizPortalText' | translate}}

- {{'kWizUseAuth' | translate}} - {{'kWizZMAuth' | translate}} + {{'kWizUseAuth' | translate}} + {{'kWizZMAuth' | translate}}
- {{'kWizBasicAuth' | translate}}

{{'kWarningBasicAuth'|translate}}

 + {{'kWizBasicAuth' | translate}}

{{'kWarningBasicAuth'|translate}}