Browse Source

Clear search bar when text includes only spaces worked for autocomplete, not for plain search bar

Joe Hawkins 8 years ago
parent
commit
6ec8a27261

+ 2 - 2
src/main/angular/src/ux/auto-complete.component.html

@@ -1,5 +1,5 @@
 <mf-search-bar search-text="$ctrl.query"
 <mf-search-bar search-text="$ctrl.query"
-               ng-keydown="$ctrl.onInputKeyDown($event)"
-               ng-focus="$ctrl.onInputFocus()"
+               ng-keydown="$ctrl.onSearchBarKeyDown($event)"
+               ng-focus="$ctrl.onSearchBarFocus()"
                auto-focus></mf-search-bar>
                auto-focus></mf-search-bar>
 <ng-transclude></ng-transclude>
 <ng-transclude></ng-transclude>

+ 2 - 6
src/main/angular/src/ux/auto-complete.component.ts

@@ -98,17 +98,13 @@ export default class AutoCompleteComponent {
         this.$element.append(compiledElement);
         this.$element.append(compiledElement);
     }
     }
 
 
-    onInputBlur(): void {
-        this.hideAutoCompleteResults();
-    }
-
-    onInputFocus(): void {
+    onSearchBarFocus(): void {
         if (this.hasItems()) {
         if (this.hasItems()) {
             this.showAutoCompleteResults();
             this.showAutoCompleteResults();
         }
         }
     }
     }
 
 
-    onInputKeyDown(event: KeyboardEvent): void {
+    onSearchBarKeyDown(event: KeyboardEvent): void {
         switch (event.keyCode) {
         switch (event.keyCode) {
             case 40: // ArrowDown
             case 40: // ArrowDown
                 this.selectNextItem();
                 this.selectNextItem();

+ 1 - 0
src/main/angular/src/ux/search-bar.component.ts

@@ -58,6 +58,7 @@ export default class SearchBarComponent {
     }
     }
 
 
     clearSearchText(): void {
     clearSearchText(): void {
+        this.searchText = '';
         this.$element.find('input').val('');
         this.$element.find('input').val('');
         this.focusInput();
         this.focusInput();
     }
     }