mass formatting and normalization - tweaked JSBeautify options

1 files changed, 38 insertions, 34 deletions

diff --git a/www/js/DevOptionsCtrl.js b/www/js/DevOptionsCtrl.js
index 984b59cc..d0b36299 100644
--- a/www/js/DevOptionsCtrl.js
+++ b/www/js/DevOptionsCtrl.js
@@ -2,10 +2,11 @@
 /* jslint browser: true*/
 /* global cordova,StatusBar,angular,console */
 
-angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope', '$rootScope', '$ionicModal', 'zm', 'NVRDataModel', '$ionicSideMenuDelegate', '$ionicPopup', '$http', '$q', '$ionicLoading', '$ionicHistory', '$state', 'SecuredPopups', '$translate', function ($scope, $rootScope, $ionicModal, zm, NVRDataModel, $ionicSideMenuDelegate, $ionicPopup, $http, $q, $ionicLoading, $ionicHistory, $state, SecuredPopups, $translate) {
+angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope', '$rootScope', '$ionicModal', 'zm', 'NVRDataModel', '$ionicSideMenuDelegate', '$ionicPopup', '$http', '$q', '$ionicLoading', '$ionicHistory', '$state', 'SecuredPopups', '$translate', function($scope, $rootScope, $ionicModal, zm, NVRDataModel, $ionicSideMenuDelegate, $ionicPopup, $http, $q, $ionicLoading, $ionicHistory, $state, SecuredPopups, $translate)
+{
 
-
-    $scope.openMenu = function () {
+    $scope.openMenu = function()
+    {
         $ionicSideMenuDelegate.toggleLeft();
         // $scope.this.will.crash = 1;
 
@@ -14,32 +15,36 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope'
     //----------------------------------------------------------------
     // 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;
         }
     };
 
-
     //----------------------------------------------------------------
     // Save anyway when you exit
     //----------------------------------------------------------------
 
-    $scope.$on('$ionicView.beforeLeave', function () {
+    $scope.$on('$ionicView.beforeLeave', function()
+    {
         saveDevOptions();
 
-
     });
 
     //-------------------------------------------------------------------------
@@ -49,18 +54,19 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope'
     // 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 ** DevOptions Ctrl Entered");
         $scope.loginData = NVRDataModel.getLogin();
 
         NVRDataModel.setAwake(false);
     });
-    
+
     $scope.isTzSupported = function()
     {
         return NVRDataModel.isTzSupported();
     };
-    
+
     $scope.getTimeZoneNow = function()
     {
         return NVRDataModel.getTimeZoneNow();
@@ -70,53 +76,56 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope'
     // Perform the login action when the user submits the login form
     //------------------------------------------------------------------
 
-    function saveDevOptions() {
+    function saveDevOptions()
+    {
         NVRDataModel.debug("SaveDevOptions: called");
 
-
         if (parseInt($scope.loginData.cycleMonitorsInterval) < zm.minCycleTime)
         {
             $scope.loginData.cycleMonitorsInterval = zm.minCycleTime.toString();
         }
-        if ((parseInt($scope.loginData.maxFPS) < 0) || (parseInt($scope.loginData.maxFPS) > zm.maxFPS)) {
+        if ((parseInt($scope.loginData.maxFPS) < 0) || (parseInt($scope.loginData.maxFPS) > zm.maxFPS))
+        {
             $scope.loginData.maxFPS = zm.defaultFPS.toString();
         }
 
-        if (parseInt($scope.loginData.refreshSec) <= 0) {
+        if (parseInt($scope.loginData.refreshSec) <= 0)
+        {
             NVRDataModel.debug("SaveDevOptions: refresh sec was too low at " +
                 $scope.loginData.refreshSec + " reset to 1");
             $scope.loginData.refreshSec = 1;
 
         }
 
-
         if ((parseInt($scope.loginData.montageQuality) < zm.safeMontageLimit) ||
-            (parseInt($scope.loginData.montageQuality) > 100)) {
+            (parseInt($scope.loginData.montageQuality) > 100))
+        {
             $scope.loginData.montageQuality = 100;
         }
 
-
         if ((parseInt($scope.loginData.singleImageQuality) < zm.safeImageQuality) ||
-            (parseInt($scope.loginData.singleImageQuality) > 100)) {
+            (parseInt($scope.loginData.singleImageQuality) > 100))
+        {
             $scope.loginData.singleImageQuality = zm.safeImageQuality.toString();
         }
 
-
         NVRDataModel.debug("SaveDevOptions: Saving to disk");
         NVRDataModel.setLogin($scope.loginData);
         NVRDataModel.getMonitors(1);
 
-
     }
 
-    $scope.saveDevOptions = function () {
+    $scope.saveDevOptions = function()
+    {
 
         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) {
+        }).then(function(res)
+        {
             $ionicSideMenuDelegate.toggleLeft();
         });
 
@@ -125,9 +134,4 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope'
     // controller main
     //------------------------------------------------------------------
 
-
-
-
-
-
-}]);
\ No newline at end of file
+}]);