From 4d06560e4d8fd02c32bd343de6950594094cae6d Mon Sep 17 00:00:00 2001 From: CloverHearts Date: Mon, 23 May 2016 17:38:15 +0900 Subject: [PATCH 1/5] Hotfix - dose not working search box on navbar. --- zeppelin-web/src/components/navbar/navbar.controller.js | 5 +++-- zeppelin-web/src/components/navbar/navbar.html | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/zeppelin-web/src/components/navbar/navbar.controller.js b/zeppelin-web/src/components/navbar/navbar.controller.js index b56ee68d5f1..d60bb66df58 100644 --- a/zeppelin-web/src/components/navbar/navbar.controller.js +++ b/zeppelin-web/src/components/navbar/navbar.controller.js @@ -91,8 +91,9 @@ angular.module('zeppelinWebApp').controller('NavCtrl', function($scope, $rootSco }); }; - $scope.search = function() { - $location.url(/search/ + $scope.searchTerm); + $scope.search = function(searchTerm) { + console.log('search term ', searchTerm); + $location.url(/search/ + searchTerm); }; function loadNotes() { diff --git a/zeppelin-web/src/components/navbar/navbar.html b/zeppelin-web/src/components/navbar/navbar.html index 70edb2199ed..ebc7dfbc35d 100644 --- a/zeppelin-web/src/components/navbar/navbar.html +++ b/zeppelin-web/src/components/navbar/navbar.html @@ -65,7 +65,7 @@
+ ng-submit="search(searchTerm)">
Date: Mon, 23 May 2016 20:55:03 +0900 Subject: [PATCH 2/5] removed console.log (pr does not working search box) --- zeppelin-web/src/components/navbar/navbar.controller.js | 1 - 1 file changed, 1 deletion(-) diff --git a/zeppelin-web/src/components/navbar/navbar.controller.js b/zeppelin-web/src/components/navbar/navbar.controller.js index d60bb66df58..05b959abf3f 100644 --- a/zeppelin-web/src/components/navbar/navbar.controller.js +++ b/zeppelin-web/src/components/navbar/navbar.controller.js @@ -92,7 +92,6 @@ angular.module('zeppelinWebApp').controller('NavCtrl', function($scope, $rootSco }; $scope.search = function(searchTerm) { - console.log('search term ', searchTerm); $location.url(/search/ + searchTerm); }; From 433139a56e6e6bd3a2bd25d87d9804d35f5c0691 Mon Sep 17 00:00:00 2001 From: CloverHearts Date: Mon, 23 May 2016 21:45:24 +0900 Subject: [PATCH 3/5] removed event locationChangeSuccess on pr ( does not working search bar) --- zeppelin-web/src/components/navbar/navbar.controller.js | 9 --------- 1 file changed, 9 deletions(-) diff --git a/zeppelin-web/src/components/navbar/navbar.controller.js b/zeppelin-web/src/components/navbar/navbar.controller.js index 05b959abf3f..33a6b2f4d20 100644 --- a/zeppelin-web/src/components/navbar/navbar.controller.js +++ b/zeppelin-web/src/components/navbar/navbar.controller.js @@ -46,15 +46,6 @@ angular.module('zeppelinWebApp').controller('NavCtrl', function($scope, $rootSco vm.connected = param; }); - $rootScope.$on('$locationChangeSuccess', function () { - var path = $location.path(); - // hacky solution to clear search bar - // TODO(felizbear): figure out how to make ng-click work in navbar - if (path === '/') { - $scope.searchTerm = ''; - } - }); - $scope.checkUsername = function () { if ($rootScope.ticket) { if ($rootScope.ticket.principal.length <= MAX_USERNAME_LENGTH) { From c592422be960d4aa147d9544bf7a4799173968d0 Mon Sep 17 00:00:00 2001 From: CloverHearts Date: Mon, 23 May 2016 23:07:19 +0900 Subject: [PATCH 4/5] add space in navbar.controller.js --- zeppelin-web/src/components/navbar/navbar.controller.js | 1 + 1 file changed, 1 insertion(+) diff --git a/zeppelin-web/src/components/navbar/navbar.controller.js b/zeppelin-web/src/components/navbar/navbar.controller.js index 33a6b2f4d20..91846d96b95 100644 --- a/zeppelin-web/src/components/navbar/navbar.controller.js +++ b/zeppelin-web/src/components/navbar/navbar.controller.js @@ -16,6 +16,7 @@ angular.module('zeppelinWebApp').controller('NavCtrl', function($scope, $rootScope, $http, $routeParams, $location, notebookListDataFactory, baseUrlSrv, websocketMsgSrv, arrayOrderingSrv) { + /** Current list of notes (ids) */ $scope.showLoginWindow = function() { From bca027b44bd91e826f3859e90129712bdf4dd134 Mon Sep 17 00:00:00 2001 From: CloverHearts Date: Tue, 24 May 2016 10:59:33 +0900 Subject: [PATCH 5/5] remove whitespace --- zeppelin-web/src/components/navbar/navbar.controller.js | 1 - 1 file changed, 1 deletion(-) diff --git a/zeppelin-web/src/components/navbar/navbar.controller.js b/zeppelin-web/src/components/navbar/navbar.controller.js index 91846d96b95..33a6b2f4d20 100644 --- a/zeppelin-web/src/components/navbar/navbar.controller.js +++ b/zeppelin-web/src/components/navbar/navbar.controller.js @@ -16,7 +16,6 @@ angular.module('zeppelinWebApp').controller('NavCtrl', function($scope, $rootScope, $http, $routeParams, $location, notebookListDataFactory, baseUrlSrv, websocketMsgSrv, arrayOrderingSrv) { - /** Current list of notes (ids) */ $scope.showLoginWindow = function() {