finish cleaning the controller

corneadoug · corneadoug · commit 2fde749b83c6 · 2016-08-05T18:08:59.000+09:00
diff --git a/zeppelin-web/src/app/app.controller.js b/zeppelin-web/src/app/app.controller.js
@@ -13,7 +13,7 @@
  */
 'use strict';
 
-angular.module('zeppelinWebApp').controller('MainCtrl', function($scope, $rootScope, $window) {
+angular.module('zeppelinWebApp').controller('MainCtrl', function($scope, $rootScope, $window, arrayOrderingSrv) {
   $scope.looknfeel = 'default';
 
   var init = function() {
@@ -41,6 +41,12 @@ angular.module('zeppelinWebApp').controller('MainCtrl', function($scope, $rootSc
     $rootScope.$broadcast('setLookAndFeel', 'default');
   });
 
+  $rootScope.noteName = function(note) {
+    if (!_.isEmpty(note)) {
+      return arrayOrderingSrv.getNoteName(note);
+    }
+  };
+
   BootstrapDialog.defaultOptions.onshown = function() {
     angular.element('#' + this.id).find('.btn:last').focus();
   };
diff --git a/zeppelin-web/src/components/navbar/navbar.controller.js b/zeppelin-web/src/components/navbar/navbar.controller.js
@@ -21,18 +21,16 @@ angular.module('zeppelinWebApp')
   var vm = this;
   vm.arrayOrderingSrv = arrayOrderingSrv;
   vm.connected = websocketMsgSrv.isConnected();
+  vm.isActive = isActive;
+  vm.logout = logout;
   vm.notes = notebookListDataFactory;
+  vm.search = search;
   vm.searchForm = searchService;
-  vm.websocketMsgSrv = websocketMsgSrv;
+  vm.showLoginWindow = showLoginWindow;
 
   $scope.query = {q: ''};
-  /** Current list of notes (ids) */
 
-  angular.element('#notebook-list').perfectScrollbar({suppressScrollX: true});
-
-  angular.element(document).click(function() {
-    $scope.query.q = '';
-  });
+  initController();
 
   function getZeppelinVersion() {
     $http.get(baseUrlSrv.getRestApiBase() + '/version').success(
@@ -44,6 +42,17 @@ angular.module('zeppelinWebApp')
       });
   }
 
+  function initController() {
+    angular.element('#notebook-list').perfectScrollbar({suppressScrollX: true});
+
+    angular.element(document).click(function() {
+      $scope.query.q = '';
+    });
+
+    getZeppelinVersion();
+    loadNotes();
+  }
+
   function isActive(noteId) {
     return ($routeParams.noteId === noteId);
   }
@@ -84,21 +93,6 @@ angular.module('zeppelinWebApp')
     }, 500);
   }
 
-  $rootScope.noteName = function(note) {
-    if (!_.isEmpty(note)) {
-      return arrayOrderingSrv.getNoteName(note);
-    }
-  };
-
-  vm.loadNotes = loadNotes;
-  vm.isActive = isActive;
-  vm.logout = logout;
-  vm.search = search;
-  vm.showLoginWindow = showLoginWindow;
-
-  getZeppelinVersion();
-  vm.loadNotes();
-
   /*
   ** $scope.$on functions below
   */
@@ -112,7 +106,7 @@ angular.module('zeppelinWebApp')
   });
 
   $scope.$on('loginSuccess', function(event, param) {
-    vm.loadNotes();
+    loadNotes();
   });
 
 });
