Replace $.get in diff file editor with axios
This commit is contained in:
parent
f88fbd2d83
commit
05076d7d12
1 changed files with 11 additions and 10 deletions
|
@ -2,7 +2,9 @@
|
||||||
/* global ace */
|
/* global ace */
|
||||||
|
|
||||||
import Vue from 'vue';
|
import Vue from 'vue';
|
||||||
import Flash from '../../flash';
|
import axios from '~/lib/utils/axios_utils';
|
||||||
|
import flash from '~/flash';
|
||||||
|
import { __ } from '~/locale';
|
||||||
|
|
||||||
((global) => {
|
((global) => {
|
||||||
global.mergeConflicts = global.mergeConflicts || {};
|
global.mergeConflicts = global.mergeConflicts || {};
|
||||||
|
@ -49,27 +51,26 @@ import Flash from '../../flash';
|
||||||
loadEditor() {
|
loadEditor() {
|
||||||
this.loading = true;
|
this.loading = true;
|
||||||
|
|
||||||
$.get(this.file.content_path)
|
axios.get(this.file.content_path)
|
||||||
.done((file) => {
|
.then(({ data }) => {
|
||||||
const content = this.$el.querySelector('pre');
|
const content = this.$el.querySelector('pre');
|
||||||
const fileContent = document.createTextNode(file.content);
|
const fileContent = document.createTextNode(data.content);
|
||||||
|
|
||||||
content.textContent = fileContent.textContent;
|
content.textContent = fileContent.textContent;
|
||||||
|
|
||||||
this.originalContent = file.content;
|
this.originalContent = data.content;
|
||||||
this.fileLoaded = true;
|
this.fileLoaded = true;
|
||||||
this.editor = ace.edit(content);
|
this.editor = ace.edit(content);
|
||||||
this.editor.$blockScrolling = Infinity; // Turn off annoying warning
|
this.editor.$blockScrolling = Infinity; // Turn off annoying warning
|
||||||
this.editor.getSession().setMode(`ace/mode/${file.blob_ace_mode}`);
|
this.editor.getSession().setMode(`ace/mode/${data.blob_ace_mode}`);
|
||||||
this.editor.on('change', () => {
|
this.editor.on('change', () => {
|
||||||
this.saveDiffResolution();
|
this.saveDiffResolution();
|
||||||
});
|
});
|
||||||
this.saveDiffResolution();
|
this.saveDiffResolution();
|
||||||
|
this.loading = false;
|
||||||
})
|
})
|
||||||
.fail(() => {
|
.catch(() => {
|
||||||
new Flash('Failed to load the file, please try again.');
|
flash(__('An error occurred while loading the file'));
|
||||||
})
|
|
||||||
.always(() => {
|
|
||||||
this.loading = false;
|
this.loading = false;
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in a new issue