From fc467d5b8306a8aa5b42f97b938899c6c07909aa Mon Sep 17 00:00:00 2001
From: Pliable Pixels <pliablepixels@gmail.com>
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 +-
 4 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'www/js')

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: '<ion-toggle ng-model="monfunc.myenabled" ng-checked="monfunc.myenabled"  toggle-class="toggle-calm">Enabled</ion-toggle><ion-radio-fix ng-repeat="item in monFunctions" ng-value="item.value" ng-model="monfunc.myfunc"> {{item.text}} </ion-radio-fix>',
+                    template: '<ion-toggle ng-model="monfunc.myenabled"   toggle-class="toggle-calm">Enabled</ion-toggle><ion-radio-fix ng-repeat="item in monFunctions" ng-value="item.value" ng-model="monfunc.myfunc"> {{item.text}} </ion-radio-fix>',
 
                     title: $translate.instant('kChangeSettingsFor') + ' ' + monitorName,
 
-- 
cgit v1.2.3