diff options
| author | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-21 09:54:54 +0000 |
|---|---|---|
| committer | Filipa Lacerda <lacerda.filipa@gmail.com> | 2017-02-21 09:54:54 +0000 |
| commit | 01e5189ef83caee007944acc4bcc035926f9504a (patch) | |
| tree | ea3cb4b858094ed97ac717320f45273f586c6b90 | |
| parent | b596dd8fedd9dc8f9487e1e67a52a7b211bd956b (diff) | |
| parent | 3c20a6478c5b2586ccc5f0fd23fac578a89bc37f (diff) | |
| download | gitlab-ce-01e5189ef83caee007944acc4bcc035926f9504a.tar.gz | |
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 bf3da8528f0..a01662e2f9e 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 |