kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Removes merge conflicts vue code from globalnamespace

Browse source
This commit is contained in:
Filipa Lacerda 2018-06-13 12:35:32 +01:00
parent 7fc47faeb6
commit 75f692748d
No known key found for this signature in database
GPG key ID: 9CA3FDE4D1E2F1C8
6 changed files with 43 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/merge_conflicts/components/inline_conflict_lines.js
View file

@ -1,14 +1,16 @@
/* eslint-disable no-param-reassign, comma-dangle */
/* eslint-disable no-param-reassign */
import Vue from 'vue';
import actionsMixin from '../mixins/line_conflict_actions';
import utilsMixin from '../mixins/line_conflict_utils';
((global) => {
(global => {
global.mergeConflicts = global.mergeConflicts || {};
global.mergeConflicts.inlineConflictLines = Vue.extend({
props: {
file: Object
file: Object,
},
mixins: [global.mergeConflicts.utils, global.mergeConflicts.actions],
mixins: [utilsMixin, actionsMixin],
});
})(window.gl || (window.gl = {}));

4
app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js
View file

@ -1,6 +1,8 @@
/* eslint-disable no-param-reassign, comma-dangle */
import Vue from 'vue';
import actionsMixin from '../mixins/line_conflict_actions';
import utilsMixin from '../mixins/line_conflict_utils';
((global) => {
global.mergeConflicts = global.mergeConflicts || {};
@ -9,7 +11,7 @@ import Vue from 'vue';
props: {
file: Object
},
mixins: [global.mergeConflicts.utils, global.mergeConflicts.actions],
mixins: [utilsMixin, actionsMixin],
template: `
<table>
<tr class="line_holder parallel" v-for="section in file.parallelLines">

31
app/assets/javascripts/merge_conflicts/merge_conflict_service.js
View file

@ -1,23 +1,16 @@
/* eslint-disable no-param-reassign, comma-dangle */
import axios from '../lib/utils/axios_utils';
((global) => {
global.mergeConflicts = global.mergeConflicts || {};
class mergeConflictsService {
constructor(options) {
this.conflictsPath = options.conflictsPath;
this.resolveConflictsPath = options.resolveConflictsPath;
}
fetchConflictsData() {
return axios.get(this.conflictsPath);
}
submitResolveConflicts(data) {
return axios.post(this.resolveConflictsPath, data);
}
export default class MergeConflictsService {
constructor(options) {
this.conflictsPath = options.conflictsPath;
this.resolveConflictsPath = options.resolveConflictsPath;
}
global.mergeConflicts.mergeConflictsService = mergeConflictsService;
})(window.gl || (window.gl = {}));
fetchConflictsData() {
return axios.get(this.conflictsPath);
}
submitResolveConflicts(data) {
return axios.post(this.resolveConflictsPath, data);
}
}

4
app/assets/javascripts/merge_conflicts/merge_conflicts_bundle.js
View file

@ -5,7 +5,7 @@ import Vue from 'vue';
import Flash from '../flash';
import initIssuableSidebar from '../init_issuable_sidebar';
import './merge_conflict_store';
import './merge_conflict_service';
import MergeConflictsService from './merge_conflict_service';
import './mixins/line_conflict_utils';
import './mixins/line_conflict_actions';
import './components/diff_file_editor';
@ -17,7 +17,7 @@ export default function initMergeConflicts() {
const INTERACTIVE_RESOLVE_MODE = 'interactive';
const conflictsEl = document.querySelector('#conflicts');
const mergeConflictsStore = gl.mergeConflicts.mergeConflictsStore;
const mergeConflictsService = new gl.mergeConflicts.mergeConflictsService({
const mergeConflictsService = new MergeConflictsService({
conflictsPath: conflictsEl.dataset.conflictsPath,
resolveConflictsPath: conflictsEl.dataset.resolveConflictsPath
});

20
app/assets/javascripts/merge_conflicts/mixins/line_conflict_actions.js
View file

@ -1,13 +1,7 @@
/* eslint-disable no-param-reassign, comma-dangle */
((global) => {
global.mergeConflicts = global.mergeConflicts || {};
global.mergeConflicts.actions = {
methods: {
handleSelected(file, sectionId, selection) {
gl.mergeConflicts.mergeConflictsStore.handleSelected(file, sectionId, selection);
}
}
};
})(window.gl || (window.gl = {}));
export default {
methods: {
handleSelected(file, sectionId, selection) {
gl.mergeConflicts.mergeConflictsStore.handleSelected(file, sectionId, selection);
},
},
};

32
app/assets/javascripts/merge_conflicts/mixins/line_conflict_utils.js
View file

@ -1,19 +1,13 @@
/* eslint-disable no-param-reassign, quote-props, comma-dangle */
((global) => {
global.mergeConflicts = global.mergeConflicts || {};
global.mergeConflicts.utils = {
methods: {
lineCssClass(line) {
return {
'head': line.isHead,
'origin': line.isOrigin,
'match': line.hasMatch,
'selected': line.isSelected,
'unselected': line.isUnselected
};
}
}
};
})(window.gl || (window.gl = {}));
export default {
methods: {
lineCssClass(line) {
return {
head: line.isHead,
origin: line.isOrigin,
match: line.hasMatch,
selected: line.isSelected,
unselected: line.isUnselected,
};
},
},
};