rename DataModel to NVR - more logical

1 files changed, 44 insertions, 44 deletions

diff --git a/www/js/MenuController.js b/www/js/MenuController.js
index 729c47d8..c8127c75 100644
--- a/www/js/MenuController.js
+++ b/www/js/MenuController.js
@@ -2,7 +2,7 @@
 /* jslint browser: true*/
 /* global cordova,StatusBar,angular,console */
 
-angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$ionicSideMenuDelegate', 'zm', '$stateParams', '$ionicHistory', '$state', 'NVRDataModel', '$rootScope', '$ionicPopup', '$translate', '$timeout', '$location', 'EventServer', 'zmAutoLogin', '$http', 'SecuredPopups', function ($scope, $ionicSideMenuDelegate, zm, $stateParams, $ionicHistory, $state, NVRDataModel, $rootScope, $ionicPopup, $translate, $timeout, $location, EventServer, zmAutoLogin, $http, SecuredPopups) {
+angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$ionicSideMenuDelegate', 'zm', '$stateParams', '$ionicHistory', '$state', 'NVR', '$rootScope', '$ionicPopup', '$translate', '$timeout', '$location', 'EventServer', 'zmAutoLogin', '$http', 'SecuredPopups', function ($scope, $ionicSideMenuDelegate, zm, $stateParams, $ionicHistory, $state, NVR, $rootScope, $ionicPopup, $translate, $timeout, $location, EventServer, zmAutoLogin, $http, SecuredPopups) {
   $scope.openMenu = function () {
     $ionicSideMenuDelegate.toggleLeft();
   };
@@ -28,7 +28,7 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io
   $scope.navigateView = function (view, args) {
 
     if (view == $state.current.name) return;
-    NVRDataModel.debug("Navigating view to: " + view);
+    NVR.debug("Navigating view to: " + view);
     $ionicHistory.nextViewOptions({
       disableBack: true
     });
@@ -55,21 +55,21 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io
 
 
     // First lets kill current stuf
-    NVRDataModel.debug("** Resetting existing server");
-    var cld = NVRDataModel.getLogin();
+    NVR.debug("** Resetting existing server");
+    var cld = NVR.getLogin();
     if (cld.isUseEventServer) {
-      NVRDataModel.debug("Stopping Event server");
+      NVR.debug("Stopping Event server");
       EventServer.disconnect();
     }
 
 
-    NVRDataModel.debug("**Switching to new server...");
+    NVR.debug("**Switching to new server...");
 
-    NVRDataModel.clearZmsMultiPortSupport();
-    var zmServers = NVRDataModel.getServerGroups();
+    NVR.clearZmsMultiPortSupport();
+    var zmServers = NVR.getServerGroups();
     var loginData = zmServers[s];
-    NVRDataModel.debug("Retrieved state for this profile:" + JSON.stringify(loginData));
-    NVRDataModel.setLogin(loginData);
+    NVR.debug("Retrieved state for this profile:" + JSON.stringify(loginData));
+    NVR.setLogin(loginData);
 
 
 
@@ -87,28 +87,28 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io
     if (window.cordova) {
 
       if (loginData.isUseBasicAuth) {
-        NVRDataModel.debug("Cordova HTTP: configuring basic auth");
+        NVR.debug("Cordova HTTP: configuring basic auth");
         cordova.plugin.http.useBasicAuth(loginData.basicAuthUser, loginData.basicAuthPassword);
       }
 
       if (!loginData.enableStrictSSL) {
 
         //alert("Enabling insecure SSL");
-        NVRDataModel.log(">>>> Disabling strict SSL checking (turn off  in Dev Options if you can't connect)");
+        NVR.log(">>>> Disabling strict SSL checking (turn off  in Dev Options if you can't connect)");
         cordova.plugin.http.setSSLCertMode('nocheck', function () {
-          NVRDataModel.debug('--> SSL is permissive, will allow any certs. Use at your own risk.');
+          NVR.debug('--> SSL is permissive, will allow any certs. Use at your own risk.');
         }, function () {
           console.log('-->Error setting SSL permissive');
         });
 
         if ($rootScope.platformOS == 'android') {
-          NVRDataModel.log (">>> Android: enabling inline image view for self signed certs");
+          NVR.log (">>> Android: enabling inline image view for self signed certs");
           cordova.plugins.certificates.trustUnsecureCerts(true);
         }
 
       } else {
 
-        NVRDataModel.log(">>>> Enabling strict SSL checking (turn off  in Dev Options if you can't connect)");
+        NVR.log(">>>> Enabling strict SSL checking (turn off  in Dev Options if you can't connect)");
 
       }
 
@@ -126,7 +126,7 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io
             });
           },
           function (err) {
-            NVRDataModel.debug("EventServer init failed");
+            NVR.debug("EventServer init failed");
           });
 
 
@@ -146,37 +146,37 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io
 
 
         // possible image digits changed between servers
-        NVRDataModel.getKeyConfigParams(0);
-        $rootScope.runMode = NVRDataModel.getBandwidth();
-        NVRDataModel.log("Validating APIs at " + apiurl);
+        NVR.getKeyConfigParams(0);
+        $rootScope.runMode = NVR.getBandwidth();
+        NVR.log("Validating APIs at " + apiurl);
         $http.get(apiurl)
           .then(function (data) {
 
               data = data.data;
-              NVRDataModel.getTimeZone(true);
+              NVR.getTimeZone(true);
               var loginStatus = $translate.instant('kExploreEnjoy') + " " + $rootScope.appName + "!";
               EventServer.refresh();
 
               // now grab and report PATH_ZMS
-              NVRDataModel.getPathZms()
+              NVR.getPathZms()
                 .then(function (data) {
-                  var ld = NVRDataModel.getLogin();
+                  var ld = NVR.getLogin();
                   var zm_cgi = data.toLowerCase();
 
                   var user_cgi = (ld.streamingurl).toLowerCase();
-                  NVRDataModel.log("ZM relative cgi-path: " + zm_cgi + ", you entered: " + user_cgi);
+                  NVR.log("ZM relative cgi-path: " + zm_cgi + ", you entered: " + user_cgi);
 
                   $http.get(ld.streamingurl + "/zms")
                     .then(function (data) {
                         data = data.data;
-                        NVRDataModel.debug("Urk! cgi-path returned  success, but it should not have come here");
+                        NVR.debug("Urk! cgi-path returned  success, but it should not have come here");
                         loginStatus = $translate.instant('kLoginStatusNoCgi');
 
-                        NVRDataModel.debug("refreshing API version...");
-                        NVRDataModel.getAPIversion()
+                        NVR.debug("refreshing API version...");
+                        NVR.getAPIversion()
                           .then(function (data) {
                               $rootScope.apiVersion = data;
-                              var refresh = NVRDataModel.getMonitors(1)
+                              var refresh = NVR.getMonitors(1)
                                 .then(function () {
 
 
@@ -194,11 +194,11 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io
 
                             },
                             function (error) {
-                              var refresh = NVRDataModel.getMonitors(1)
+                              var refresh = NVR.getMonitors(1)
                                 .then(function () {
                                   console.log("+++ state go after API version error: " + error);
                                   $rootScope.apiVersion = "0.0.0";
-                                  NVRDataModel.debug("Error, failed API version, setting to " + $rootScope.apiVersion);
+                                  NVR.debug("Error, failed API version, setting to " + $rootScope.apiVersion);
 
                                   $ionicHistory.nextViewOptions({
                                     disableBack: true
@@ -225,12 +225,12 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io
                           loginStatus = $translate.instant('kLoginStatusNoCgiAlt');
                         }
 
-                        NVRDataModel.displayBanner((status < 500) ? 'error' : 'info', [loginStatus]);
+                        NVR.displayBanner((status < 500) ? 'error' : 'info', [loginStatus]);
 
-                        NVRDataModel.debug("refreshing API version...");
-                        NVRDataModel.getAPIversion()
+                        NVR.debug("refreshing API version...");
+                        NVR.getAPIversion()
                           .then(function (data) {
-                              var refresh = NVRDataModel.getMonitors(1)
+                              var refresh = NVR.getMonitors(1)
                                 .then(function () {
                                   $rootScope.apiVersion = data;
                                   $ionicHistory.nextViewOptions({
@@ -246,10 +246,10 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io
 
                             },
                             function (error) {
-                              var refresh = NVRDataModel.getMonitors(1)
+                              var refresh = NVR.getMonitors(1)
                                 .then(function () {
                                   $rootScope.apiVersion = "0.0.0";
-                                  NVRDataModel.debug("Error, failed API version, setting to " + $rootScope.apiVersion);
+                                  NVR.debug("Error, failed API version, setting to " + $rootScope.apiVersion);
                                   $ionicHistory.nextViewOptions({
                                     disableBack: true
                                   });
@@ -268,8 +268,8 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io
 
             },
             function (error) {
-              NVRDataModel.displayBanner('error', [$translate.instant('kBannerAPICheckFailed'), $translate.instant('kBannerPleaseCheck')]);
-              NVRDataModel.log("API login error " + JSON.stringify(error));
+              NVR.displayBanner('error', [$translate.instant('kBannerAPICheckFailed'), $translate.instant('kBannerPleaseCheck')]);
+              NVR.log("API login error " + JSON.stringify(error));
 
               $rootScope.zmPopup = SecuredPopups.show('alert', {
                 title: $translate.instant('kLoginValidAPIFailedTitle'),
@@ -288,7 +288,7 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io
     $scope.newServer = {
       val: ""
     };
-    $scope.avs = Object.keys(NVRDataModel.getServerGroups());
+    $scope.avs = Object.keys(NVR.getServerGroups());
 
     $scope.avs = $scope.avs.filter(function () {
       return true;
@@ -303,7 +303,7 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io
       template: '<ion-radio-fix ng-if="item" ng-repeat="item in avs" ng-value="item" ng-model="newServer.val" > {{item}} </ion-radio-fix>',
 
       title: $translate.instant('kSelect'),
-      subTitle: $translate.instant('kActive') + ': '+ NVRDataModel.getLogin().serverName,
+      subTitle: $translate.instant('kActive') + ': '+ NVR.getLogin().serverName,
 
       buttons: [{
           text: $translate.instant('kButtonCancel'),
@@ -318,12 +318,12 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io
         {
           text: $translate.instant('kButtonOk'),
           onTap: function (e) {
-            NVRDataModel.log("Server selected:" + $scope.newServer.val);
+            NVR.log("Server selected:" + $scope.newServer.val);
             if ($ionicSideMenuDelegate.isOpen()) {
               $ionicSideMenuDelegate.toggleLeft();
 
             }
-            if (NVRDataModel.getLogin().serverName != $scope.newServer.val)
+            if (NVR.getLogin().serverName != $scope.newServer.val)
               switchToServer($scope.newServer.val);
 
             //$rootScope.$broadcast('server-changed');
@@ -341,7 +341,7 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io
 
 
   $scope.switchLang = function () {
-    $scope.lang = NVRDataModel.getLanguages();
+    $scope.lang = NVR.getLanguages();
     $scope.myopt = {
       lang: ""
     };
@@ -362,8 +362,8 @@ angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$io
         {
           text: $translate.instant('kButtonOk'),
           onTap: function (e) {
-            NVRDataModel.log("Language selected:" + $scope.myopt.lang);
-            NVRDataModel.setDefaultLanguage($scope.myopt.lang, true);
+            NVR.log("Language selected:" + $scope.myopt.lang);
+            NVR.setDefaultLanguage($scope.myopt.lang, true);
             $rootScope.$broadcast('language-changed');
 
             //return "OK";