From 2e1a669455190e3d0d857e613cc34cd22f4862c0 Mon Sep 17 00:00:00 2001 From: Pliable Pixels Date: Thu, 1 Sep 2016 11:44:40 -0400 Subject: mostly formatting and removal of console.logs Former-commit-id: 5cbac40ad5ccb7096fb7b9f58696e923ba282232 --- www/js/DevOptionsCtrl.js | 71 +++++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 34 deletions(-) (limited to 'www/js/DevOptionsCtrl.js') diff --git a/www/js/DevOptionsCtrl.js b/www/js/DevOptionsCtrl.js index 502c02d0..fab6cfc2 100644 --- a/www/js/DevOptionsCtrl.js +++ b/www/js/DevOptionsCtrl.js @@ -2,36 +2,40 @@ /* jslint browser: true*/ /* global cordova,StatusBar,angular,console */ -angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope', '$rootScope', '$ionicModal', 'zm', 'ZMDataModel', '$ionicSideMenuDelegate', '$ionicPopup', '$http', '$q', '$ionicLoading', '$ionicHistory','$state', 'SecuredPopups', '$translate', function ($scope, $rootScope, $ionicModal, zm, ZMDataModel, $ionicSideMenuDelegate, $ionicPopup, $http, $q, $ionicLoading, $ionicHistory, $state, SecuredPopups, $translate) { +angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope', '$rootScope', '$ionicModal', 'zm', 'ZMDataModel', '$ionicSideMenuDelegate', '$ionicPopup', '$http', '$q', '$ionicLoading', '$ionicHistory', '$state', 'SecuredPopups', '$translate', function ($scope, $rootScope, $ionicModal, zm, ZMDataModel, $ionicSideMenuDelegate, $ionicPopup, $http, $q, $ionicLoading, $ionicHistory, $state, SecuredPopups, $translate) { $scope.openMenu = function () { $ionicSideMenuDelegate.toggleLeft(); - // $scope.this.will.crash = 1; - + // $scope.this.will.crash = 1; + }; - + //---------------------------------------------------------------- // Alarm notification handling //---------------------------------------------------------------- - $scope.handleAlarms = function() - { - $rootScope.isAlarm=!$rootScope.isAlarm; - if (!$rootScope.isAlarm) - { - $rootScope.alarmCount="0"; - $ionicHistory.nextViewOptions({disableBack: true}); - $state.go("events", {"id": 0}, { reload: true }); + $scope.handleAlarms = function () { + $rootScope.isAlarm = !$rootScope.isAlarm; + if (!$rootScope.isAlarm) { + $rootScope.alarmCount = "0"; + $ionicHistory.nextViewOptions({ + disableBack: true + }); + $state.go("events", { + "id": 0 + }, { + reload: true + }); } }; - - + + //---------------------------------------------------------------- // Save anyway when you exit //---------------------------------------------------------------- - - $scope.$on('$ionicView.beforeLeave', function () { - saveDevOptions(); + + $scope.$on('$ionicView.beforeLeave', function () { + saveDevOptions(); }); @@ -46,27 +50,26 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope' $scope.$on('$ionicView.enter', function () { //console.log("**VIEW ** DevOptions Ctrl Entered"); $scope.loginData = ZMDataModel.getLogin(); - + ZMDataModel.setAwake(false); }); //------------------------------------------------------------------ // Perform the login action when the user submits the login form //------------------------------------------------------------------ - - function saveDevOptions() - { + + function saveDevOptions() { ZMDataModel.zmDebug("SaveDevOptions: called"); - + if ((parseInt($scope.loginData.maxFPS) < 0) || (parseInt($scope.loginData.maxFPS) > zm.maxFPS)) { $scope.loginData.maxFPS = zm.defaultFPS.toString(); } - + if (parseInt($scope.loginData.refreshSec) <= 0) { - ZMDataModel.zmDebug("SaveDevOptions: refresh sec was too low at " + - $scope.loginData.refreshSec + " reset to 1"); + ZMDataModel.zmDebug("SaveDevOptions: refresh sec was too low at " + + $scope.loginData.refreshSec + " reset to 1"); $scope.loginData.refreshSec = 1; } @@ -76,8 +79,8 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope' (parseInt($scope.loginData.montageQuality) > 70)) { $scope.loginData.montageQuality = 70; } - - + + if ((parseInt($scope.loginData.singleImageQuality) < zm.safeImageQuality) || (parseInt($scope.loginData.singleImageQuality) > 100)) { $scope.loginData.singleImageQuality = zm.safeImageQuality.toString(); @@ -88,27 +91,27 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope' ZMDataModel.setLogin($scope.loginData); ZMDataModel.getMonitors(1); - + } - + $scope.saveDevOptions = function () { - - saveDevOptions(); + + saveDevOptions(); // $rootScope.zmPopup.close(); - $rootScope.zmPopup= SecuredPopups.show('alert',{ + $rootScope.zmPopup = SecuredPopups.show('alert', { title: $translate.instant('kSettingsSaved'), template: "{{'kExploreEnjoy' | translate }} {{$root.appName}}" }).then(function (res) { $ionicSideMenuDelegate.toggleLeft(); }); - + }; //------------------------------------------------------------------ // controller main //------------------------------------------------------------------ - + -- cgit v1.2.3