Make ajax filter more consistent and only filter when typed

1 files changed, 12 insertions, 3 deletions

diff --git a/app/assets/javascripts/droplab/droplab_ajax_filter.js b/app/assets/javascripts/droplab/droplab_ajax_filter.js
index 7603556d2ef..f2720a0371b 100644
--- a/app/assets/javascripts/droplab/droplab_ajax_filter.js
+++ b/app/assets/javascripts/droplab/droplab_ajax_filter.js
@@ -12,7 +12,7 @@ require('../window')(function(w){
       this.debounceTriggerWrapper = this.debounceTrigger.bind(this);
       this.hook.trigger.addEventListener('keydown.dl', this.debounceTriggerWrapper);
       this.hook.trigger.addEventListener('focus', this.debounceTriggerWrapper);
-      this.trigger();
+      this.trigger(true);
     },
 
     notLoading: function notLoading() {
@@ -22,6 +22,7 @@ require('../window')(function(w){
     debounceTrigger: function debounceTrigger(e) {
       var NON_CHARACTER_KEYS = [16, 17, 18, 20, 37, 38, 39, 40, 91, 93];
       var invalidKeyPressed = NON_CHARACTER_KEYS.indexOf(e.detail.which || e.detail.keyCode) > -1;
+      var focusEvent = false;
       if (invalidKeyPressed || this.loading) {
         return;
       }
@@ -30,10 +31,14 @@ require('../window')(function(w){
         clearTimeout(this.timeout);
       }
 
-      this.timeout = setTimeout(this.trigger.bind(this), 200);
+      if (e.type === 'focus') {
+        focusEvent = true;
+      }
+
+      this.timeout = setTimeout(this.trigger.bind(this, focusEvent), 200);
     },
 
-    trigger: function trigger() {
+    trigger: function trigger(getEntireList = false) {
       var config = this.hook.config.droplabAjaxFilter;
       var searchValue = this.trigger.value;
 
@@ -45,6 +50,10 @@ require('../window')(function(w){
         searchValue = config.searchValueFunction();
       }
 
+      if (getEntireList) {
+        searchValue = '';
+      }
+
       if (searchValue === config.searchKey) {
         return this.list.show();
       }