From 31ca68739126f5740681238539a8c6a1b66e0000 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Fri, 18 Nov 2016 09:28:08 -0500 Subject: mass formatting and normalization - tweaked JSBeautify options --- www/js/LoginCtrl.js | 416 +++++++++++++++++++++++++++++++--------------------- 1 file changed, 246 insertions(+), 170 deletions(-) (limited to 'www/js/LoginCtrl.js') diff --git a/www/js/LoginCtrl.js b/www/js/LoginCtrl.js index db0440b4..2cf490e3 100644 --- a/www/js/LoginCtrl.js +++ b/www/js/LoginCtrl.js @@ -2,14 +2,15 @@ /* jslint browser: true*/ /* global cordova,StatusBar,angular,console,alert,URI, localforage */ -angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$rootScope', 'zm', '$ionicModal', 'NVRDataModel', '$ionicSideMenuDelegate', '$ionicPopup', '$http', '$q', '$ionicLoading', 'zmAutoLogin', '$cordovaPinDialog', 'EventServer', '$ionicHistory', '$state', '$ionicActionSheet', 'SecuredPopups', '$stateParams', '$translate', function ($scope, $rootScope, zm, $ionicModal, NVRDataModel, $ionicSideMenuDelegate, $ionicPopup, $http, $q, $ionicLoading, zmAutoLogin, $cordovaPinDialog, EventServer, $ionicHistory, $state, $ionicActionSheet, SecuredPopups, $stateParams, $translate) { - $scope.openMenu = function () { - +angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$rootScope', 'zm', '$ionicModal', 'NVRDataModel', '$ionicSideMenuDelegate', '$ionicPopup', '$http', '$q', '$ionicLoading', 'zmAutoLogin', '$cordovaPinDialog', 'EventServer', '$ionicHistory', '$state', '$ionicActionSheet', 'SecuredPopups', '$stateParams', '$translate', function($scope, $rootScope, zm, $ionicModal, NVRDataModel, $ionicSideMenuDelegate, $ionicPopup, $http, $q, $ionicLoading, zmAutoLogin, $cordovaPinDialog, EventServer, $ionicHistory, $state, $ionicActionSheet, SecuredPopups, $stateParams, $translate) +{ + $scope.openMenu = function() + { + saveItems(false); $ionicSideMenuDelegate.toggleLeft(); - - }; + }; var oldName; var serverbuttons = []; @@ -24,72 +25,85 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r $scope.check.isUseAuth = ($scope.loginData.isUseAuth) ? true : false; $scope.check.isUseEventServer = ($scope.loginData.isUseEventServer == true) ? true : false; - document.addEventListener("pause", onPause, false); document.addEventListener("resume", onResume, false); - function onResume() { + function onResume() + { NVRDataModel.log("Login screen resumed"); } - function onPause() { + function onPause() + { NVRDataModel.log("Login screen going to background, saving data"); localforage.setItem("settings-temp-data", $scope.loginData); } - //---------------------------------------------------------------- // Alarm notification handling //---------------------------------------------------------------- - $scope.handleAlarms = function () { + $scope.handleAlarms = function() + { $rootScope.isAlarm = !$rootScope.isAlarm; - if (!$rootScope.isAlarm) { + if (!$rootScope.isAlarm) + { $rootScope.alarmCount = "0"; - $ionicHistory.nextViewOptions({ + $ionicHistory.nextViewOptions( + { disableBack: true }); - $state.go("events", { + $state.go("events", + { "id": 0, - "playEvent":false - }, { + "playEvent": false + }, + { reload: true }); return; } - + }; //---------------------------------------------------------------- // Specifies a linked profile to try if this profile fails //---------------------------------------------------------------- - $scope.selectFallback = function () { + $scope.selectFallback = function() + { var as = Object.keys(NVRDataModel.getServerGroups()); - if (as.length < 2) { - $rootScope.zmPopup = SecuredPopups.show('alert', { + if (as.length < 2) + { + $rootScope.zmPopup = SecuredPopups.show('alert', + { title: $translate.instant('kError'), template: $translate.instant('kFallback2Configs') }); return; } - var ab = [{ + var ab = [ + { text: $translate.instant('kClear') }]; var ld = NVRDataModel.getLogin(); - as.forEach(function (item) { - if (item != ld.serverName) ab.push({ + as.forEach(function(item) + { + if (item != ld.serverName) ab.push( + { text: item }); }); - var sheet = $ionicActionSheet.show({ + var sheet = $ionicActionSheet.show( + { buttons: ab, titleText: $translate.instant('kSelectFallback'), cancelText: $translate.instant('kButtonCancel'), - cancel: function () {}, - buttonClicked: function (index) { + cancel: function() {}, + buttonClicked: function(index) + { //console.log ("YOU WANT " + ab[index].text + index); if (index == 0) $scope.loginData.fallbackConfiguration = ""; @@ -100,27 +114,30 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r } }); - - }; //---------------------------------------------------------------- // This is called when the user changes profiles //---------------------------------------------------------------- - $scope.serverActionSheet = function () { - var hideSheet = $ionicActionSheet.show({ + $scope.serverActionSheet = function() + { + var hideSheet = $ionicActionSheet.show( + { buttons: serverbuttons, destructiveText: $translate.instant('kDelete'), titleText: $translate.instant('kManageServerGroups'), cancelText: $translate.instant('kButtonCancel'), - cancel: function () { + cancel: function() + { // add cancel code.. }, - buttonClicked: function (index) { + buttonClicked: function(index) + { //console.log ("YOU WANT " + serverbuttons[index].text + " INDEX " + index); - if (serverbuttons[index].text == $translate.instant('kServerAdd') + "...") { + if (serverbuttons[index].text == $translate.instant('kServerAdd') + "...") + { $scope.loginData = angular.copy(NVRDataModel.getDefaultLoginObject()); return true; @@ -131,7 +148,6 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r //console.log ("NEW LOGIN OBJECT IS " + JSON.stringify($scope.loginData)); - $scope.check.isUseAuth = ($scope.loginData.isUseAuth) ? true : false; $scope.check.isUseEventServer = ($scope.loginData.isUseEventServer == true) ? true : false; @@ -147,19 +163,20 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r return true; }, - destructiveButtonClicked: function () { + destructiveButtonClicked: function() + { - - if (!$scope.loginData.serverName) { + if (!$scope.loginData.serverName) + { NVRDataModel.debug("cannot delete empty entry"); return true; - } var zmServers = NVRDataModel.getServerGroups(); //console.log ("YOU WANT TO DELETE " + $scope.loginData.serverName); //console.log ("LENGTH OF SERVERS IS " + Object.keys(zmServers).length); - if (Object.keys(zmServers).length > 1) { + if (Object.keys(zmServers).length > 1) + { NVRDataModel.log("Deleting " + $scope.loginData.serverName); delete zmServers[$scope.loginData.serverName]; @@ -171,33 +188,37 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r NVRDataModel.setLogin($scope.loginData); availableServers = Object.keys(NVRDataModel.getServerGroups()); - serverbuttons = [{ + serverbuttons = [ + { text: $translate.instant('kServerAdd') + "..." }]; - for (var servIter = 0; servIter < availableServers.length; servIter++) { - serverbuttons.push({ + for (var servIter = 0; servIter < availableServers.length; servIter++) + { + serverbuttons.push( + { text: availableServers[servIter] }); //console.log("ADDING : " + availableServers[servIter]); } //console.log (">>>>>>>delete: server buttons " + JSON.stringify(serverbuttons)); - } else { + } + else + { NVRDataModel.displayBanner('error', [$translate.instant('kBannerCannotDeleteNeedOne')]); } return true; } - }); }; - //---------------------------------------------------------------- // This is when you tap on event server settings //---------------------------------------------------------------- - $scope.eventServerSettings = function () { + $scope.eventServerSettings = function() + { NVRDataModel.debug("Saving settings before going to Event Server settings"); //console.log ( "My loginData saved " + JSON.stringify($scope.loginData)); NVRDataModel.setLogin($scope.loginData); @@ -205,8 +226,6 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r return; }; - - //------------------------------------------------------------------------- // Lets make sure we set screen dim properly as we enter // The problem is we enter other states before we leave previous states @@ -214,73 +233,81 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r // reset power state on exit as if it is called after we enter another // state, that effectively overwrites current view power management needs //------------------------------------------------------------------------ - $scope.$on('$ionicView.enter', function () { + $scope.$on('$ionicView.enter', function() + { //console.log("**VIEW ** LoginCtrl Entered"); NVRDataModel.setAwake(false); var ld = NVRDataModel.getLogin(); oldName = ld.serverName; availableServers = Object.keys(NVRDataModel.getServerGroups()); - serverbuttons = [{ + serverbuttons = [ + { text: $translate.instant('kServerAdd') + "..." }]; - for (var servIter = 0; servIter < availableServers.length; servIter++) { - serverbuttons.push({ + for (var servIter = 0; servIter < availableServers.length; servIter++) + { + serverbuttons.push( + { text: availableServers[servIter] }); - //console.log (">>>>>>>ionicview enter: server buttons " + JSON.stringify(serverbuttons)); } - - NVRDataModel.debug("Does login need to hear the wizard? " + $stateParams.wizard); - if ($stateParams.wizard == "true") { + if ($stateParams.wizard == "true") + { NVRDataModel.log("Creating new login entry for wizard"); $scope.loginData = angular.copy(NVRDataModel.getDefaultLoginObject()); $scope.loginData.serverName = $rootScope.wizard.serverName; $scope.loginData.url = $rootScope.wizard.loginURL; $scope.loginData.apiurl = $rootScope.wizard.apiURL; $scope.loginData.streamingurl = $rootScope.wizard.streamingURL; - if ($rootScope.wizard.useauth && $rootScope.wizard.usezmauth) { + if ($rootScope.wizard.useauth && $rootScope.wizard.usezmauth) + { $scope.loginData.username = $rootScope.wizard.zmuser; $scope.loginData.password = $rootScope.wizard.zmpassword; - } else { + } + else + { $scope.loginData.isUseAuth = false; } - if ((/^https:\/\//i.test($scope.loginData.url))) { + if ((/^https:\/\//i.test($scope.loginData.url))) + { $scope.loginData.useSSL = true; } - - } else { + } + else + { var savedData; - localforage.getItem("settings-temp-data").then(function (value) { + localforage.getItem("settings-temp-data").then(function(value) + { savedData = value; //= zmStorageService.getObject ("settings-temp-data"); - if (!NVRDataModel.isEmpty(savedData)) { + if (!NVRDataModel.isEmpty(savedData)) + { $scope.loginData = savedData; NVRDataModel.log("retrieved pre-stored loginData on past pause: " + JSON.stringify($scope.loginData)); localforage.removeItem("settings-temp-data"); //zmStorageService.setObject("settings-temp-data", {}); - } else { + } + else + { NVRDataModel.log("Not recovering login data as its empty"); } }); } - }); - - $scope.$on('$ionicView.beforeLeave', function () { + $scope.$on('$ionicView.beforeLeave', function() + { //console.log("**VIEW ** LoginCtrl Entered"); - - }); //---------------------------------------------------------------- @@ -315,54 +342,65 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r } });*/ - $rootScope.$on('$stateChangeSuccess', function () { + $rootScope.$on('$stateChangeSuccess', function() + { $scope.ignoreDirty = false; }); // Make a noble attempt at deciphering - - //-------------------------------------------------------------------------- // When PIN is enabled, this is called to specify a PIN // FIXME: Get rid of cordovaPinDialog. It's really not needed //-------------------------------------------------------------------------- - $scope.pinPrompt = function (evt) { + $scope.pinPrompt = function(evt) + { NVRDataModel.log("Password prompt"); - if ($scope.loginData.usePin) { + if ($scope.loginData.usePin) + { $scope.loginData.pinCode = ""; $cordovaPinDialog.prompt($translate.instant('kEnterPin'), $translate.instant('kPinProtect')).then( - function (result1) { + function(result1) + { // console.log (JSON.stringify(result1)); - if (result1.input1 && result1.buttonIndex == 1) { + if (result1.input1 && result1.buttonIndex == 1) + { $cordovaPinDialog.prompt($translate.instant('kReconfirmPin'), $translate.instant('kPinProtect')) - .then(function (result2) { - if (result1.input1 == result2.input1) { + .then(function(result2) + { + if (result1.input1 == result2.input1) + { NVRDataModel.log("Pin code match"); $scope.loginData.pinCode = result1.input1; - } else { + } + else + { NVRDataModel.log("Pin code mismatch"); $scope.loginData.usePin = false; NVRDataModel.displayBanner('error', [$translate.instant('kBannerPinMismatch')]); } }, - function (error) { + function(error) + { //console.log("Error inside"); $scope.loginData.usePin = false; }); - } else { + } + else + { $scope.loginData.usePin = false; } }, - function (error) { + function(error) + { //console.log("Error outside"); $scope.loginData.usePin = false; }); - - - } else { + } + else + { NVRDataModel.debug("Password disabled"); } }; @@ -371,47 +409,56 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r // Makes input easier //------------------------------------------------------------------------------- - $scope.portalKeypress = function (evt) { + $scope.portalKeypress = function(evt) + { - if (/^https:\/\//i.test($scope.loginData.url)) { + if (/^https:\/\//i.test($scope.loginData.url)) + { $scope.loginData.useSSL = true; - } else { + } + else + { $scope.loginData.useSSL = false; } - if ($scope.loginData.url.slice(-1) == '/') { + if ($scope.loginData.url.slice(-1) == '/') + { $scope.loginData.apiurl = $scope.loginData.url + "api"; $scope.loginData.streamingurl = $scope.loginData.url + "cgi-bin"; - } else { + } + else + { $scope.loginData.apiurl = $scope.loginData.url + "/api"; $scope.loginData.streamingurl = $scope.loginData.url + "/cgi-bin"; } - }; //------------------------------------------------------------------------------- // Adds http to url if not present // http://stackoverflow.com/questions/11300906/check-if-a-string-starts-with-http-using-javascript //------------------------------------------------------------------------------- - function addhttp(url) { + function addhttp(url) + { - if ((!/^(f|ht)tps?:\/\//i.test(url)) && (url != "")) { + if ((!/^(f|ht)tps?:\/\//i.test(url)) && (url != "")) + { url = "http://" + url; } return url; } + function addWsOrWss(url) + { - function addWsOrWss(url) { - - if ((!/^wss?:\/\//i.test(url)) && (url != "")) { + if ((!/^wss?:\/\//i.test(url)) && (url != "")) + { url = "ws://" + url; } return url; } - - function endsWith(str, suffix) { + function endsWith(str, suffix) + { return str.indexOf(suffix, str.length - suffix.length) !== -1; } @@ -419,15 +466,14 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r // Perform the login action when the user submits the login form //----------------------------------------------------------------------------- - function saveItems(showalert) { - + function saveItems(showalert) + { //console.log ("*********** SAVE ITEMS CALLED "); //console.log('Saving login'); NVRDataModel.setFirstUse(false); - + // used for menu display - // lets so some basic sanitization of the data // I am already adding "/" so lets remove spurious ones @@ -443,29 +489,29 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r $scope.loginData.username = $scope.loginData.username.trim(); - - - $scope.loginData.isUseAuth = ($scope.check.isUseAuth) ? true : false; $scope.loginData.isUseEventServer = ($scope.check.isUseEventServer) ? true : false; - if ($scope.loginData.url.slice(-1) == '/') { + if ($scope.loginData.url.slice(-1) == '/') + { $scope.loginData.url = $scope.loginData.url.slice(0, -1); } - if ($scope.loginData.apiurl.slice(-1) == '/') { + if ($scope.loginData.apiurl.slice(-1) == '/') + { $scope.loginData.apiurl = $scope.loginData.apiurl.slice(0, -1); } - - if ($scope.loginData.streamingurl.slice(-1) == '/') { + if ($scope.loginData.streamingurl.slice(-1) == '/') + { $scope.loginData.streamingurl = $scope.loginData.streamingurl.slice(0, -1); } - if ($scope.loginData.eventServer.slice(-1) == '/') { + if ($scope.loginData.eventServer.slice(-1) == '/') + { $scope.loginData.eventServer = $scope.loginData.eventServer.slice(0, -1); } @@ -483,15 +529,17 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r $scope.loginData.streamingurl = addhttp($scope.loginData.streamingurl); $scope.loginData.eventServer = addWsOrWss($scope.loginData.eventServer); - if ($scope.loginData.useSSL) { + if ($scope.loginData.useSSL) + { // replace all http with https $scope.loginData.url = $scope.loginData.url.replace("http:", "https:"); $scope.loginData.apiurl = $scope.loginData.apiurl.replace("http:", "https:"); $scope.loginData.streamingurl = $scope.loginData.streamingurl.replace("http:", "https:"); $scope.loginData.eventServer = $scope.loginData.eventServer.replace("ws:", "wss:"); - - } else { + } + else + { // replace all https with http $scope.loginData.url = $scope.loginData.url.replace("https:", "http:"); $scope.loginData.apiurl = $scope.loginData.apiurl.replace("https:", "http:"); @@ -502,27 +550,29 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r var apiurl = $scope.loginData.apiurl + '/host/getVersion.json'; var portalurl = $scope.loginData.url + '/index.php'; - - // Check if isUseAuth is set make sure u/p have a dummy value - if ($scope.check.isUseAuth) { + if ($scope.check.isUseAuth) + { if (!$scope.loginData.username) $scope.loginData.username = "x"; if (!$scope.loginData.password) $scope.loginData.password = "x"; //NVRDataModel.log("Authentication is disabled, setting dummy user & pass"); } - if (parseInt($scope.loginData.maxMontage) <= 0) { + if (parseInt($scope.loginData.maxMontage) <= 0) + { $scope.loginData.maxMontage = "100"; } - // do this before setLogin so message is sent - if (!$scope.check.isUseEventServer) { + if (!$scope.check.isUseEventServer) + { $rootScope.isAlarm = 0; - if ($rootScope.apnsToken) { + if ($rootScope.apnsToken) + { NVRDataModel.log("Making sure we don't get push notifications"); - EventServer.sendMessage('push', { + EventServer.sendMessage('push', + { type: 'token', platform: $rootScope.platformOS, token: $rootScope.apnsToken, @@ -532,23 +582,27 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r } NVRDataModel.setLogin($scope.loginData); - + $rootScope.runMode = NVRDataModel.getBandwidth(); - + oldName = $scope.loginData.serverName; - if ($scope.check.isUseEventServer) { + if ($scope.check.isUseEventServer) + { EventServer.init(); - if ($rootScope.apnsToken && $scope.loginData.disablePush != true) { + if ($rootScope.apnsToken && $scope.loginData.disablePush != true) + { NVRDataModel.log("Making sure we get push notifications"); - EventServer.sendMessage('push', { + EventServer.sendMessage('push', + { type: 'token', platform: $rootScope.platformOS, token: $rootScope.apnsToken, state: "enabled" }, 1); } - EventServer.sendMessage("control", { + EventServer.sendMessage("control", + { type: 'filter', monlist: $scope.loginData.eventServerMonitors, intlist: $scope.loginData.eventServerInterval @@ -556,19 +610,21 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r } - // lets logout NVRDataModel.debug("Logging out of current session..."); $rootScope.authSession = "undefined"; - $http({ + $http( + { method: 'POST', //withCredentials: true, url: $scope.loginData.url + '/index.php', - headers: { + headers: + { 'Content-Type': 'application/x-www-form-urlencoded', 'Accept': 'application/json', }, - transformRequest: function (obj) { + transformRequest: function(obj) + { var str = []; for (var p in obj) str.push(encodeURIComponent(p) + "=" + @@ -577,12 +633,14 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r return params; }, - data: { + data: + { action: "logout", view: "login" } }) - .finally(function (ans) { + .finally(function(ans) + { zmAutoLogin.doLogin("") // Do the happy menu only if authentication works @@ -590,13 +648,15 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r // fail in app.js that will be called to show an error // box - .then(function (data) { + .then(function(data) + { // Now let's validate if the API works // note that due to reachability, it might have switched to another server - if ($scope.loginData.serverName != NVRDataModel.getLogin().serverName) { + if ($scope.loginData.serverName != NVRDataModel.getLogin().serverName) + { NVRDataModel.debug(">>> Server information has changed, likely a fallback took over!"); $scope.loginData = NVRDataModel.getLogin(); apiurl = $scope.loginData.apiurl + '/host/getVersion.json'; @@ -606,21 +666,19 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r // possible image digits changed between servers NVRDataModel.getKeyConfigParams(0); - NVRDataModel.log("Validating APIs at " + apiurl); $http.get(apiurl) - .success(function (data) { + .success(function(data) + { - NVRDataModel.getTimeZone(true); var loginStatus = $translate.instant('kExploreEnjoy') + " " + $rootScope.appName + "!"; EventServer.refresh(); - - // now grab and report PATH_ZMS NVRDataModel.getPathZms() - .then(function (data) { + .then(function(data) + { var ld = NVRDataModel.getLogin(); var zm_cgi = data.toLowerCase(); @@ -628,27 +686,33 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r NVRDataModel.log("ZM relative cgi-path: " + zm_cgi + ", you entered: " + user_cgi); $http.get(ld.streamingurl + "/zms") - .success(function (data) { + .success(function(data) + { NVRDataModel.debug("Urk! cgi-path returned success, but it should not have come here"); loginStatus = $translate.instant('kLoginStatusNoCgi'); NVRDataModel.debug("refreshing API version..."); NVRDataModel.getAPIversion() - .then(function (data) { + .then(function(data) + { var refresh = NVRDataModel.getMonitors(1); $rootScope.apiVersion = data; }, - function (error) { + function(error) + { var refresh = NVRDataModel.getMonitors(1); $rootScope.apiVersion = "0.0.0"; NVRDataModel.debug("Error, failed API version, setting to " + $rootScope.apiVersion); }); - if (showalert) { - $rootScope.zmPopup = SecuredPopups.show('alert', { + if (showalert) + { + $rootScope.zmPopup = SecuredPopups.show('alert', + { title: $translate.instant('kLoginValidatedTitle'), template: loginStatus - }).then(function (res) { + }).then(function(res) + { $ionicSideMenuDelegate.toggleLeft(); NVRDataModel.debug("Force reloading monitors..."); @@ -656,19 +720,24 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r }); } }) - .error(function (error, status) { + .error(function(error, status) + { // If its 5xx, then the cgi-bin path is valid // if its 4xx then the cgi-bin path is not valid - if (status < 500) { + if (status < 500) + { loginStatus = $translate.instant('kLoginStatusNoCgiAlt'); } - if (showalert) { - $rootScope.zmPopup = SecuredPopups.show('alert', { + if (showalert) + { + $rootScope.zmPopup = SecuredPopups.show('alert', + { title: $translate.instant('kLoginValidatedTitle'), template: loginStatus - }).then(function (res) { + }).then(function(res) + { $ionicSideMenuDelegate.toggleLeft(); NVRDataModel.debug("Force reloading monitors..."); @@ -677,11 +746,13 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r } NVRDataModel.debug("refreshing API version..."); NVRDataModel.getAPIversion() - .then(function (data) { + .then(function(data) + { var refresh = NVRDataModel.getMonitors(1); $rootScope.apiVersion = data; }, - function (error) { + function(error) + { var refresh = NVRDataModel.getMonitors(1); $rootScope.apiVersion = "0.0.0"; NVRDataModel.debug("Error, failed API version, setting to " + $rootScope.apiVersion); @@ -690,22 +761,20 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r }); }); - - }) - .error(function (error) { + .error(function(error) + { NVRDataModel.displayBanner('error', [$translate.instant('kBannerAPICheckFailed'), $translate.instant('kBannerPleaseCheck')]); NVRDataModel.log("API login error " + JSON.stringify(error)); - $rootScope.zmPopup = SecuredPopups.show('alert', { + $rootScope.zmPopup = SecuredPopups.show('alert', + { title: $translate.instant('kLoginValidAPIFailedTitle'), template: $translate.instant('kBannerPleaseCheck') }); }); }); - - }); } @@ -714,24 +783,33 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r // calling saveItems also updates the defaultServer //----------------------------------------------- - $scope.saveItems = function () { + $scope.saveItems = function() + { - if (!$scope.loginData.serverName) { - $rootScope.zmPopup = $ionicPopup.alert({ + if (!$scope.loginData.serverName) + { + $rootScope.zmPopup = $ionicPopup.alert( + { title: $translate.instant('kError'), template: $translate.instant('kServerEmptyError'), }) - .then(function (res) { + .then(function(res) + { return; }); - } else { + } + else + { saveItems(true); availableServers = Object.keys(NVRDataModel.getServerGroups()); - serverbuttons = [{ + serverbuttons = [ + { text: $translate.instant('kServerAdd') + "..." }]; - for (var servIter = 0; servIter < availableServers.length; servIter++) { - serverbuttons.push({ + for (var servIter = 0; servIter < availableServers.length; servIter++) + { + serverbuttons.push( + { text: availableServers[servIter] }); } @@ -739,8 +817,6 @@ angular.module('zmApp.controllers').controller('zmApp.LoginCtrl', ['$scope', '$r } - }; - -}]); \ No newline at end of file +}]); -- cgit v1.2.3