debian-mirror-gitlab/app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js

35 lines
1.3 KiB
JavaScript
Raw Normal View History

2018-11-08 19:23:39 +05:30
/* eslint-disable no-param-reassign */
2017-08-17 22:00:37 +05:30
import Vue from 'vue';
2018-11-08 19:23:39 +05:30
import actionsMixin from '../mixins/line_conflict_actions';
import utilsMixin from '../mixins/line_conflict_utils';
2017-08-17 22:00:37 +05:30
2018-12-13 13:39:08 +05:30
(global => {
2017-08-17 22:00:37 +05:30
global.mergeConflicts = global.mergeConflicts || {};
global.mergeConflicts.parallelConflictLines = Vue.extend({
2018-11-08 19:23:39 +05:30
mixins: [utilsMixin, actionsMixin],
2017-08-17 22:00:37 +05:30
props: {
2018-11-08 19:23:39 +05:30
file: {
type: Object,
required: true,
},
2017-08-17 22:00:37 +05:30
},
template: `
<table>
<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>
</template>
</tr>
</table>
`,
});
})(window.gl || (window.gl = {}));