Convered compare.js to axios
This commit is contained in:
parent
33517d546e
commit
9846332fcd
1 changed files with 21 additions and 26 deletions
|
@ -1,5 +1,6 @@
|
|||
/* eslint-disable func-names, space-before-function-paren, wrap-iife, quotes, no-var, object-shorthand, consistent-return, no-unused-vars, comma-dangle, vars-on-top, prefer-template, max-len */
|
||||
import { localTimeAgo } from './lib/utils/datetime_utility';
|
||||
import axios from './lib/utils/axios_utils';
|
||||
|
||||
export default class Compare {
|
||||
constructor(opts) {
|
||||
|
@ -41,17 +42,14 @@ export default class Compare {
|
|||
}
|
||||
|
||||
getTargetProject() {
|
||||
return $.ajax({
|
||||
url: this.opts.targetProjectUrl,
|
||||
data: {
|
||||
target_project_id: $("input[name='merge_request[target_project_id]']").val()
|
||||
$('.mr_target_commit').empty();
|
||||
|
||||
return axios.get(this.opts.targetProjectUrl, {
|
||||
params: {
|
||||
target_project_id: $("input[name='merge_request[target_project_id]']").val(),
|
||||
},
|
||||
beforeSend: function() {
|
||||
return $('.mr_target_commit').empty();
|
||||
},
|
||||
success: function(html) {
|
||||
return $('.js-target-branch-dropdown .dropdown-content').html(html);
|
||||
}
|
||||
}).then(({ data }) => {
|
||||
$('.js-target-branch-dropdown .dropdown-content').html(data);
|
||||
});
|
||||
}
|
||||
|
||||
|
@ -68,22 +66,19 @@ export default class Compare {
|
|||
});
|
||||
}
|
||||
|
||||
static sendAjax(url, loading, target, data) {
|
||||
var $target;
|
||||
$target = $(target);
|
||||
return $.ajax({
|
||||
url: url,
|
||||
data: data,
|
||||
beforeSend: function() {
|
||||
static sendAjax(url, loading, target, params) {
|
||||
const $target = $(target);
|
||||
|
||||
loading.show();
|
||||
return $target.empty();
|
||||
},
|
||||
success: function(html) {
|
||||
$target.empty();
|
||||
|
||||
return axios.get(url, {
|
||||
params,
|
||||
}).then(({ data }) => {
|
||||
loading.hide();
|
||||
$target.html(html);
|
||||
$target.html(data);
|
||||
var className = '.' + $target[0].className.replace(' ', '.');
|
||||
localTimeAgo($('.js-timeago', className));
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue