diff options
author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-06 13:55:49 -0500 |
---|---|---|
committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-06 13:55:49 -0500 |
commit | 5f4ce722c0f5fbf9129dddf20de879f00db4a311 (patch) | |
tree | 4897c09832de893562ff832c19e5774234e81ebb /app/assets | |
parent | ee87d15cf443e66f47e20b92bb442b9e1874fee7 (diff) | |
download | gitlab-ce-5f4ce722c0f5fbf9129dddf20de879f00db4a311.tar.gz |
Display clear button only if input has a value
Diffstat (limited to 'app/assets')
-rw-r--r-- | app/assets/javascripts/search_autocomplete.js.coffee | 7 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/search.scss | 16 |
2 files changed, 12 insertions, 11 deletions
diff --git a/app/assets/javascripts/search_autocomplete.js.coffee b/app/assets/javascripts/search_autocomplete.js.coffee index 5a0df7817c9..9c85ce1633b 100644 --- a/app/assets/javascripts/search_autocomplete.js.coffee +++ b/app/assets/javascripts/search_autocomplete.js.coffee @@ -142,7 +142,7 @@ class @SearchAutocomplete @searchInput.on 'keyup', @onSearchInputKeyUp @searchInput.on 'click', @onSearchInputClick @searchInput.on 'focus', @onSearchInputFocus - @clearInput.on 'click', @onRemoveLocationClick + @clearInput.on 'click', @onClearInputClick onDocumentClick: (e) => if not $.contains(@dropdown[0], e.target) and @isFocused @@ -189,6 +189,8 @@ class @SearchAutocomplete # We should display the menu only when input is not empty @enableAutocomplete() + @wrap.toggleClass 'has-value', !!e.target.value + # Avoid falsy value to be returned return @@ -200,9 +202,8 @@ class @SearchAutocomplete @isFocused = true @wrap.addClass('search-active') - onRemoveLocationClick: (e) => + onClearInputClick: (e) => e.preventDefault() - @removeLocationBadge() @searchInput.val('').focus() onSearchInputBlur: (e) => diff --git a/app/assets/stylesheets/pages/search.scss b/app/assets/stylesheets/pages/search.scss index 9274796233b..f0f3744c6fa 100644 --- a/app/assets/stylesheets/pages/search.scss +++ b/app/assets/stylesheets/pages/search.scss @@ -144,16 +144,16 @@ color: $location-icon-active-color; } } + } - &.has-location-badge { - .search-icon { - display: none; - } + &.has-value { + .search-icon { + display: none; + } - .clear-icon { - cursor: pointer; - display: block; - } + .clear-icon { + cursor: pointer; + display: block; } } |