diff options
author | Filipa Lacerda <filipa@gitlab.com> | 2018-01-29 10:32:07 +0000 |
---|---|---|
committer | Filipa Lacerda <filipa@gitlab.com> | 2018-01-29 10:32:21 +0000 |
commit | 570bf1bb99ea8db5e66029c5123b4d580c1b0df0 (patch) | |
tree | e3bb3d907c93ae6e6f7747193fa2a13df66cdd3a /app/assets/javascripts/filterable_list.js | |
parent | 5ba03e585b0d228aeafb8374bf929cd1141edba9 (diff) | |
parent | f8dd398a21b19cb7d5609260fcc18b0ce2bd617a (diff) | |
download | gitlab-ce-570bf1bb99ea8db5e66029c5123b4d580c1b0df0.tar.gz |
[ci skip] Merge branch 'master' into fl-vue-mr-widget
* master: (21 commits)
normalize headers correctly i18n flash message
fixed dashboard projects not being filterable
Converted filterable_list to axios
Converted due_date_select to axios
Converted dropzone_input to axios
Converted create_merge_request_dropdown to axios
converted compare_autocomplete to axios
Convered compare.js to axios
Set alternate object directories in run_git
Digital Ocean Spaces now supports AWS v4 streaming API
Fix spec failures in issues_spec.rb
Fix #42486.
Generalize toggle_buttons.js
update code based on feedback
add changelog
fix spec
add spec
disable retry attempts for Import/Export until that is fixed
add an extra spec
fix validation error on services
...
Diffstat (limited to 'app/assets/javascripts/filterable_list.js')
-rw-r--r-- | app/assets/javascripts/filterable_list.js | 31 |
1 files changed, 13 insertions, 18 deletions
diff --git a/app/assets/javascripts/filterable_list.js b/app/assets/javascripts/filterable_list.js index 9e91f72b2ea..a10f027de53 100644 --- a/app/assets/javascripts/filterable_list.js +++ b/app/assets/javascripts/filterable_list.js @@ -1,4 +1,5 @@ import _ from 'underscore'; +import axios from './lib/utils/axios_utils'; /** * Makes search request for content when user types a value in the search input. @@ -54,32 +55,26 @@ export default class FilterableList { this.listFilterElement.removeEventListener('input', this.debounceFilter); } - filterResults(queryData) { + filterResults(params) { if (this.isBusy) { return false; } $(this.listHolderElement).fadeTo(250, 0.5); - return $.ajax({ - url: this.getFilterEndpoint(), - data: queryData, - type: 'GET', - dataType: 'json', - context: this, - complete: this.onFilterComplete, - beforeSend: () => { - this.isBusy = true; - }, - success: (response, textStatus, xhr) => { - this.onFilterSuccess(response, xhr, queryData); - }, - }); + this.isBusy = true; + + return axios.get(this.getFilterEndpoint(), { + params, + }).then((res) => { + this.onFilterSuccess(res, params); + this.onFilterComplete(); + }).catch(() => this.onFilterComplete()); } - onFilterSuccess(response, xhr, queryData) { - if (response.html) { - this.listHolderElement.innerHTML = response.html; + onFilterSuccess(response, queryData) { + if (response.data.html) { + this.listHolderElement.innerHTML = response.data.html; } // Change url so if user reload a page - search results are saved |