summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/filterable_list.js
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-01-26 10:49:05 +0000
committerPhil Hughes <me@iamphill.com>2018-01-29 09:06:57 +0000
commitb3c9d965591c6d1ebfc821c6a7f121fa0ad0a24b (patch)
treeab02b9635ba5ca62200b6d876b0afc33b968c0a7 /app/assets/javascripts/filterable_list.js
parent3bb085654e588e894abca95510d00d89f59b1850 (diff)
downloadgitlab-ce-b3c9d965591c6d1ebfc821c6a7f121fa0ad0a24b.tar.gz
Converted filterable_list to axios
Diffstat (limited to 'app/assets/javascripts/filterable_list.js')
-rw-r--r--app/assets/javascripts/filterable_list.js29
1 files changed, 12 insertions, 17 deletions
diff --git a/app/assets/javascripts/filterable_list.js b/app/assets/javascripts/filterable_list.js
index 9e91f72b2ea..b84325ac5ce 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) {
+ onFilterSuccess(response, queryData) {
if (response.html) {
- this.listHolderElement.innerHTML = response.html;
+ this.listHolderElement.innerHTML = response.data.html;
}
// Change url so if user reload a page - search results are saved