Skip to content

ZEPPELIN-866] Hotfix - does not working search box on navbar. #911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cloverhearts wants to merge 5 commits into from
Closed

ZEPPELIN-866] Hotfix - does not working search box on navbar. #911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4d06560
Hotfix - dose not working search box on navbar.
cloverhearts May 23, 2016
bac1254
removed console.log (pr does not working search box)
cloverhearts May 23, 2016
433139a
removed event locationChangeSuccess on pr ( does not working search bar)
cloverhearts May 23, 2016
c592422
add space in navbar.controller.js
cloverhearts May 23, 2016
bca027b
remove whitespace
cloverhearts May 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 2 additions & 11 deletions zeppelin-web/src/components/navbar/navbar.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down Expand Up @@ -91,8 +82,8 @@ angular.module('zeppelinWebApp').controller('NavCtrl', function($scope, $rootSco
});
};

$scope.search = function() {
$location.url(/search/ + $scope.searchTerm);
$scope.search = function(searchTerm) {
$location.url(/search/ + searchTerm);
};

function loadNotes() {
Expand Down
2 changes: 1 addition & 1 deletion zeppelin-web/src/components/navbar/navbar.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<!--TODO(bzz): move to Typeahead https://angular-ui.github.io/bootstrap -->
<form role="search"
style="width: 300px; display: inline-block; margin: 0 10px"
ng-submit="search()">
ng-submit="search(searchTerm)">
Copy link
Contributor

@heruka-urgyen heruka-urgyen May 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i definitely like passing the argument to search instead of taking it from the $scope 👍

<div class="input-group">
<input
type="text"
Expand Down