Merge pull request #1 from pliablepixels/master

updating

1 files changed, 28 insertions, 22 deletions

diff --git a/www/js/HelpCtrl.js b/www/js/HelpCtrl.js
index ce4ec761..51da877b 100644
--- a/www/js/HelpCtrl.js
+++ b/www/js/HelpCtrl.js
@@ -2,26 +2,32 @@
 /* jslint browser: true*/
 /* global cordova,StatusBar,angular,console, Masonry */
 
-angular.module('zmApp.controllers').controller('zmApp.HelpCtrl', ['$scope', '$rootScope', '$ionicModal', 'NVRDataModel', '$ionicSideMenuDelegate', '$ionicHistory', '$state', '$translate', '$q', '$templateRequest', '$sce', '$compile', function ($scope, $rootScope, $ionicModal, NVRDataModel, $ionicSideMenuDelegate, $ionicHistory, $state, $translate, $q, $templateRequest, $sce, $compile) {
-    $scope.openMenu = function () {
+angular.module('zmApp.controllers').controller('zmApp.HelpCtrl', ['$scope', '$rootScope', '$ionicModal', 'NVRDataModel', '$ionicSideMenuDelegate', '$ionicHistory', '$state', '$translate', '$q', '$templateRequest', '$sce', '$compile', function($scope, $rootScope, $ionicModal, NVRDataModel, $ionicSideMenuDelegate, $ionicHistory, $state, $translate, $q, $templateRequest, $sce, $compile)
+{
+    $scope.openMenu = function()
+    {
         $ionicSideMenuDelegate.toggleLeft();
     };
 
-
     //----------------------------------------------------------------
     // 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;
@@ -33,7 +39,8 @@ angular.module('zmApp.controllers').controller('zmApp.HelpCtrl', ['$scope', '$ro
     // based on selected language
     //----------------------------------------------------------------
 
-    function insertHelp() {
+    function insertHelp()
+    {
 
         var l = NVRDataModel.getDefaultLanguage() || 'en';
         var lang = "lang/help/help-" + l + ".html";
@@ -43,25 +50,27 @@ angular.module('zmApp.controllers').controller('zmApp.HelpCtrl', ['$scope', '$ro
         var templateUrlFB = $sce.getTrustedResourceUrl(lang_fb);
 
         $templateRequest(lang)
-            .then(function (template) {
+            .then(function(template)
+                {
                     var elem = angular.element(document.getElementById('insertHelp'));
                     $compile(elem.html(template).contents())($scope);
                 },
-                function (error) {
+                function(error)
+                {
                     NVRDataModel.log("Language file " + lang + " not found, falling back");
                     $templateRequest(templateUrlFB)
-                        .then(function (template) {
+                        .then(function(template)
+                            {
                                 var elem = angular.element(document.getElementById('insertHelp'));
                                 $compile(elem.html(template).contents())($scope);
                             },
-                            function (error) {
+                            function(error)
+                            {
                                 NVRDataModel.log("fallback help not found");
                             });
                 }
             );
 
-
-
     }
 
     //-------------------------------------------------------------------------
@@ -71,16 +80,13 @@ angular.module('zmApp.controllers').controller('zmApp.HelpCtrl', ['$scope', '$ro
     // 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 ** Help Ctrl Entered");
         NVRDataModel.setAwake(false);
         $scope.zmAppVersion = NVRDataModel.getAppVersion();
         insertHelp();
 
-
-
-
-
     });
 
-}]);
\ No newline at end of file
+}]);