Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
6dbca364
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
6dbca364
编写于
11月 09, 2016
作者:
A
Alfredo Sumaran
提交者:
Fatih Acet
11月 10, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix Merge Conflicts app to make it work with Vue 2
上级
e9c66be1
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
17 addition
and
27 deletion
+17
-27
app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js.es6
...merge_conflicts/components/parallel_conflict_lines.js.es6
+16
-1
app/views/projects/merge_requests/conflicts.html.haml
app/views/projects/merge_requests/conflicts.html.haml
+1
-4
app/views/projects/merge_requests/conflicts/components/_parallel_conflict_line.html.haml
...ts/conflicts/components/_parallel_conflict_line.html.haml
+0
-9
app/views/projects/merge_requests/conflicts/components/_parallel_conflict_lines.html.haml
...s/conflicts/components/_parallel_conflict_lines.html.haml
+0
-13
未找到文件。
app/assets/javascripts/merge_conflicts/components/parallel_conflict_lines.js.es6
浏览文件 @
6dbca364
...
...
@@ -7,7 +7,22 @@
props: {
file: Object
},
mixins: [global.mergeConflicts.utils, global.mergeConflicts.actions]
mixins: [global.mergeConflicts.utils, global.mergeConflicts.actions],
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 = {}));
app/views/projects/merge_requests/conflicts.html.haml
浏览文件 @
6dbca364
...
...
@@ -30,11 +30,8 @@
.diff-wrap-lines.code.file-content.js-syntax-highlight
{
"v-show"
=>
"!isParallel && file.resolveMode === 'interactive' && file.type === 'text'"
}
=
render
partial:
"projects/merge_requests/conflicts/components/inline_conflict_lines"
.diff-wrap-lines.code.file-content.js-syntax-highlight
{
"v-show"
=>
"isParallel && file.resolveMode === 'interactive' && file.type === 'text'"
}
=
render
partial:
"projects/merge_requests/conflicts/components/parallel_conflict_lines"
%parallel-conflict-lines
{
":file"
=>
"file"
}
%div
{
"v-show"
=>
"file.resolveMode === 'edit' || file.type === 'text-editor'"
}
=
render
partial:
"projects/merge_requests/conflicts/components/diff_file_editor"
=
render
partial:
"projects/merge_requests/conflicts/submit_form"
-# Components
=
render
partial:
'projects/merge_requests/conflicts/components/parallel_conflict_line'
app/views/projects/merge_requests/conflicts/components/_parallel_conflict_line.html.haml
已删除
100644 → 0
浏览文件 @
e9c66be1
%script
{
"id"
=>
'parallel-conflict-line'
,
"type"
=>
"text/x-template"
}
%td
.diff-line-num.header
{
":class"
=>
"lineCssClass(line)"
,
"v-if"
=>
"line.isHeader"
}
%td
.line_content.header
{
":class"
=>
"lineCssClass(line)"
,
"v-if"
=>
"line.isHeader"
}
%strong
{{line.richText}}
%button
.btn
{
"@click"
=>
"handleSelected(file, line.id, line.section)"
}
{{line.buttonTitle}}
%td
.diff-line-num.old_line
{
":class"
=>
"lineCssClass(line)"
,
"v-if"
=>
"!line.isHeader"
}
{{line.lineNumber}}
%td
.line_content.parallel
{
":class"
=>
"lineCssClass(line)"
,
"v-if"
=>
"!line.isHeader"
,
"v-html"
=>
"line.richText"
}
app/views/projects/merge_requests/conflicts/components/_parallel_conflict_lines.html.haml
已删除
100644 → 0
浏览文件 @
e9c66be1
%parallel-conflict-lines
{
"inline-template"
=>
"true"
,
":file"
=>
"file"
}
%table
%tr
.line_holder.parallel
{
"v-for"
=>
"section in file.parallelLines"
}
%template
{
"is"
=>
"parallel-conflict-line"
,
"v-for"
=>
"line in section"
,
":line"
=>
"line"
,
":file"
=>
"file"
}
%td
.diff-line-num.header
{
":class"
=>
"lineCssClass(line)"
,
"v-if"
=>
"line.isHeader"
}
%td
.line_content.header
{
":class"
=>
"lineCssClass(line)"
,
"v-if"
=>
"line.isHeader"
}
%strong
{{line.richText}}
%button
.btn
{
"@click"
=>
"handleSelected(file, line.id, line.section)"
}
{{line.buttonTitle}}
%td
.diff-line-num.old_line
{
":class"
=>
"lineCssClass(line)"
,
"v-if"
=>
"!line.isHeader"
}
{{line.lineNumber}}
%td
.line_content.parallel
{
":class"
=>
"lineCssClass(line)"
,
"v-if"
=>
"!line.isHeader"
,
"v-html"
=>
"line.richText"
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录