2018-06-16 13:20:30 +00:00
|
|
|
/* eslint-disable no-param-reassign */
|
2017-03-17 17:21:25 +00:00
|
|
|
|
|
|
|
import Vue from 'vue';
|
2018-06-13 11:35:32 +00:00
|
|
|
import actionsMixin from '../mixins/line_conflict_actions';
|
|
|
|
import utilsMixin from '../mixins/line_conflict_utils';
|
2016-12-14 03:01:05 +00:00
|
|
|
|
2018-10-10 06:27:42 +00:00
|
|
|
(global => {
|
2016-10-05 12:57:22 +00:00
|
|
|
global.mergeConflicts = global.mergeConflicts || {};
|
|
|
|
|
|
|
|
global.mergeConflicts.parallelConflictLines = Vue.extend({
|
2018-06-13 13:36:40 +00:00
|
|
|
mixins: [utilsMixin, actionsMixin],
|
2016-10-05 12:57:22 +00:00
|
|
|
props: {
|
2018-06-11 09:49:47 +00:00
|
|
|
file: {
|
|
|
|
type: Object,
|
|
|
|
required: true,
|
|
|
|
},
|
2016-10-05 12:57:22 +00:00
|
|
|
},
|
2016-11-09 20:17:49 +00:00
|
|
|
template: `
|
2019-03-23 13:22:16 +00:00
|
|
|
<table class="diff-wrap-lines code js-syntax-highlight">
|
2016-11-09 20:17:49 +00:00
|
|
|
<tr class="line_holder parallel" v-for="section in file.parallelLines">
|
|
|
|
<template v-for="line in section">
|
|
|
|
<td class="diff-line-num header" :class="lineCssClass(line)" v-if="line.isHeader"></td>
|
|
|
|
<td class="line_content header" :class="lineCssClass(line)" v-if="line.isHeader">
|
|
|
|
<strong>{{line.richText}}</strong>
|
|
|
|
<button class="btn" @click="handleSelected(file, line.id, line.section)">{{line.buttonTitle}}</button>
|
|
|
|
</td>
|
|
|
|
<td class="diff-line-num old_line" :class="lineCssClass(line)" v-if="!line.isHeader">{{line.lineNumber}}</td>
|
|
|
|
<td class="line_content parallel" :class="lineCssClass(line)" v-if="!line.isHeader" v-html="line.richText"></td>
|
2016-12-14 03:01:05 +00:00
|
|
|
</template>
|
2016-11-09 20:17:49 +00:00
|
|
|
</tr>
|
|
|
|
</table>
|
|
|
|
`,
|
2016-10-05 12:57:22 +00:00
|
|
|
});
|
|
|
|
})(window.gl || (window.gl = {}));
|