Change approach, do not use timeoutsissue_14800

1 files changed, 5 insertions, 16 deletions

diff --git a/app/assets/javascripts/search_autocomplete.js.coffee b/app/assets/javascripts/search_autocomplete.js.coffee
index 564fb265b9d..10325c3fa8f 100644
--- a/app/assets/javascripts/search_autocomplete.js.coffee
+++ b/app/assets/javascripts/search_autocomplete.js.coffee
@@ -202,18 +202,11 @@ class @SearchAutocomplete
     @skipBlurEvent = true
 
   onSearchInputBlur: (e) =>
-    @skipBlurEvent = false
+    @wrap.removeClass('search-active')
 
-    # We should wait to make sure we are not clearing the input instead
-    setTimeout( =>
-      return if @skipBlurEvent
-
-      @wrap.removeClass('search-active')
-
-      # If input is blank then restore state
-      if @searchInput.val() is ''
-        @restoreOriginalState()
-    , 150)
+    # If input is blank then restore state
+    if @searchInput.val() is ''
+      @restoreOriginalState()
 
   addLocationBadge: (item) ->
     category = if item.category? then "#{item.category}: " else ''
@@ -291,9 +284,5 @@ class @SearchAutocomplete
 
       $el.removeClass('is-active')
       @disableAutocomplete()
+      @onSearchInputFocus()
       @searchInput.val('').focus()
-
-      # We need to wait because of @skipBlurEvent
-      setTimeout( =>
-        @onSearchInputFocus()
-      , 200)