1 files changed, 55 insertions, 61 deletions
diff --git a/www/js/MenuController.js b/www/js/MenuController.js
index e353d310..477849a6 100644
--- a/www/js/MenuController.js
+++ b/www/js/MenuController.js
@@ -2,78 +2,72 @@
 /* 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', function($scope, $ionicSideMenuDelegate, zm, $stateParams, $ionicHistory, $state, NVRDataModel, $rootScope, $ionicPopup, $translate, $timeout)
-{
-    $scope.openMenu = function()
-    {
-        $ionicSideMenuDelegate.toggleLeft();
-    };
+angular.module('zmApp.controllers').controller('MenuController', ['$scope', '$ionicSideMenuDelegate', 'zm', '$stateParams', '$ionicHistory', '$state', 'NVRDataModel', '$rootScope', '$ionicPopup', '$translate', '$timeout', function ($scope, $ionicSideMenuDelegate, zm, $stateParams, $ionicHistory, $state, NVRDataModel, $rootScope, $ionicPopup, $translate, $timeout) {
+  $scope.openMenu = function () {
+    $ionicSideMenuDelegate.toggleLeft();
+  };
+
+  //----------------------------------------------------------------
+  // This controller sits along with the main app to  bring up 
+  // the language menu from the main menu
+  //----------------------------------------------------------------
+
+
 
-    //----------------------------------------------------------------
-    // This controller sits along with the main app to  bring up 
-    // the language menu from the main menu
-    //----------------------------------------------------------------
+  $scope.navigateView = function (view, args) {
 
+    if (view == $state.current.name) return;
+    NVRDataModel.debug("Navigating view to: " + view);
+    $ionicHistory.nextViewOptions({
+      disableBack: true
+    });
+    $state.go(view, args);
 
+    /*  $timeout (function() {
+        window.stop();
+        // after window stop executes, in next cycle
+        // this _should_ ensure stop concludes before
+        // exit/entry lifecycles kick in?
+        $timeout (function() {$state.go(view,args);});
+        
+      });*/
 
-    $scope.navigateView = function(view,args) {
+  };
 
-        if (view == $state.current.name) return;
-        NVRDataModel.debug ("Navigating view to: " + view);
-        $ionicHistory.nextViewOptions({
-            disableBack: true
-          });
-          $state.go(view,args);
 
-        /*  $timeout (function() {
-            window.stop();
-            // after window stop executes, in next cycle
-            // this _should_ ensure stop concludes before
-            // exit/entry lifecycles kick in?
-            $timeout (function() {$state.go(view,args);});
-            
-          });*/
-          
+  $scope.switchLang = function () {
+    $scope.lang = NVRDataModel.getLanguages();
+    $scope.myopt = {
+      lang: ""
     };
 
+    $rootScope.zmPopup = $ionicPopup.show({
+      scope: $scope,
+      template: '<ion-radio-fix ng-repeat="item in lang" ng-value="item.value" ng-model="myopt.lang"> {{item.text}} </ion-radio-fix>',
 
-    $scope.switchLang = function()
-    {
-        $scope.lang = NVRDataModel.getLanguages();
-        $scope.myopt = {
-            lang: ""
-        };
+      title: $translate.instant('kSelectLanguage'),
 
-        $rootScope.zmPopup = $ionicPopup.show(
+      buttons: [{
+          text: $translate.instant('kButtonCancel'),
+          onTap: function (e) {
+            //return "CANCEL";
+          }
+
+        },
         {
-            scope: $scope,
-            template: '<ion-radio-fix ng-repeat="item in lang" ng-value="item.value" ng-model="myopt.lang"> {{item.text}} </ion-radio-fix>',
-
-            title: $translate.instant('kSelectLanguage'),
-
-            buttons: [
-            {
-                text: $translate.instant('kButtonCancel'),
-                onTap: function(e)
-                {
-                    //return "CANCEL";
-                }
-
-            },
-            {
-                text: $translate.instant('kButtonOk'),
-                onTap: function(e)
-                {
-                    NVRDataModel.log("Language selected:" + $scope.myopt.lang);
-                    NVRDataModel.setDefaultLanguage($scope.myopt.lang, true);
-                    $rootScope.$broadcast('language-changed');
-
-                    //return "OK";
-
-                }
-            }]
-        });
+          text: $translate.instant('kButtonOk'),
+          onTap: function (e) {
+            NVRDataModel.log("Language selected:" + $scope.myopt.lang);
+            NVRDataModel.setDefaultLanguage($scope.myopt.lang, true);
+            $rootScope.$broadcast('language-changed');
 
-    };
+            //return "OK";
+
+          }
+        }
+      ]
+    });
+
+  };
 
 }]);