diff options
| author | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-21 12:54:54 +0300 |
|---|---|---|
| committer | Ruben Davila <rdavila84@gmail.com> | 2017-02-22 03:13:53 +0300 |
| commit | b307833fd1e267f9c67ce500e915436983021acd (patch) | |
| tree | 0efe0903fc3f930ab929b2a390da78eef13f69f5 | |
| parent | cadea9cad6dbb2763085424c1d4b754ee561cc8d (diff) | |
Merge branch 'dropdown-loading-class-add' into 'master'
Changes when loading indicator is added to dropdown
See merge request !9345
| -rw-r--r-- | app/assets/javascripts/gl_dropdown.js | 3 | ||||
| -rw-r--r-- | spec/features/projects/ref_switcher_spec.rb | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/gl_dropdown.js b/app/assets/javascripts/gl_dropdown.js index c5a1daff776..88894a68489 100644 --- a/app/assets/javascripts/gl_dropdown.js +++ b/app/assets/javascripts/gl_dropdown.js @@ -47,9 +47,10 @@ } // Only filter asynchronously only if option remote is set if (this.options.remote) { - $inputContainer.parent().addClass('is-loading'); clearTimeout(timeout); return timeout = setTimeout(function() { + $inputContainer.parent().addClass('is-loading'); + return this.options.query(this.input.val(), function(data) { $inputContainer.parent().removeClass('is-loading'); return this.options.callback(data); diff --git a/spec/features/projects/ref_switcher_spec.rb b/spec/features/projects/ref_switcher_spec.rb index 4eafac1acd8..3b8f0b2d3f8 100644 --- a/spec/features/projects/ref_switcher_spec.rb +++ b/spec/features/projects/ref_switcher_spec.rb @@ -20,6 +20,8 @@ feature 'Ref switcher', feature: true, js: true do input.set 'binary' wait_for_ajax + expect(find('.dropdown-content ul')).to have_selector('li', count: 6) + page.within '.dropdown-content ul' do input.native.send_keys :enter end |