Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
397686df
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,发现更多精彩内容 >>
提交
397686df
编写于
7月 18, 2017
作者:
F
Fatih Acet
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
IssueNotesRefactor: Implement note edit conflict warning.
上级
3c946b93
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
38 addition
and
5 deletion
+38
-5
app/assets/javascripts/notes/components/issue_note_actions.vue
...ssets/javascripts/notes/components/issue_note_actions.vue
+2
-2
app/assets/javascripts/notes/components/issue_note_body.vue
app/assets/javascripts/notes/components/issue_note_body.vue
+7
-1
app/assets/javascripts/notes/components/issue_note_form.vue
app/assets/javascripts/notes/components/issue_note_form.vue
+29
-2
未找到文件。
app/assets/javascripts/notes/components/issue_note_actions.vue
浏览文件 @
397686df
...
...
@@ -111,7 +111,7 @@ export default {
<button
@
click=
"editHandler"
type=
"button"
class=
"btn btn-transparent"
>
class=
"btn btn-transparent
js-note-edit
"
>
Edit comment
</button>
</li>
...
...
@@ -126,7 +126,7 @@ export default {
<a
v-if=
"canEdit"
@
click.prevent=
"deleteHandler"
class=
"js-note-delete"
class=
"js-note-delete
js-note-delete
"
href=
"#"
>
<span
class=
"text-danger"
>
Delete comment
...
...
app/assets/javascripts/notes/components/issue_note_body.vue
浏览文件 @
397686df
...
...
@@ -28,6 +28,11 @@ export default {
required
:
true
,
},
},
computed
:
{
noteBody
()
{
return
this
.
note
.
note
;
},
},
components
:
{
IssueNoteEditedText
,
IssueNoteAwardsList
,
...
...
@@ -75,7 +80,8 @@ export default {
ref=
"noteForm"
:updateHandler=
"handleFormUpdate"
:cancelHandler=
"formCancelHandler"
:noteBody=
"note.note"
/>
:noteBody=
"noteBody"
:noteId=
"note.id"
/>
<textarea
v-if=
"canEdit"
v-model=
"note.note"
...
...
app/assets/javascripts/notes/components/issue_note_form.vue
浏览文件 @
397686df
...
...
@@ -9,6 +9,10 @@ export default {
required
:
false
,
default
:
''
,
},
noteId
:
{
type
:
Number
,
required
:
false
,
},
updateHandler
:
{
type
:
Function
,
required
:
true
,
...
...
@@ -29,8 +33,18 @@ export default {
note
:
this
.
noteBody
,
markdownPreviewUrl
:
''
,
markdownDocsUrl
:
''
,
conflictWhileEditing
:
false
,
};
},
watch
:
{
noteBody
()
{
if
(
this
.
note
===
this
.
initialNote
)
{
this
.
note
=
this
.
noteBody
;
}
else
{
this
.
conflictWhileEditing
=
true
;
}
},
},
components
:
{
MarkdownField
,
},
...
...
@@ -57,6 +71,9 @@ export default {
isDirty
()
{
return
this
.
initialNote
!==
this
.
note
;
},
noteHash
()
{
return
`#note_
${
this
.
noteId
}
`
;
},
},
mounted
()
{
const
issuableDataEl
=
document
.
getElementById
(
'
js-issuable-app-initial-data
'
);
...
...
@@ -72,6 +89,16 @@ export default {
<
template
>
<div
class=
"note-edit-form"
>
<div
v-if=
"conflictWhileEditing"
class=
"js-conflict-edit-warning alert alert-danger"
>
This comment has changed since you started editing, please review the
<a
:href=
"noteHash"
target=
"_blank"
rel=
"noopener noreferrer"
>
updated comment
</a>
to ensure information is not lost.
</div>
<form
class=
"edit-note common-note-form"
>
<markdown-field
:markdown-preview-url=
"markdownPreviewUrl"
...
...
@@ -79,7 +106,7 @@ export default {
:addSpacingClasses=
"false"
>
<textarea
id=
"note-body"
class=
"note-textarea js-gfm-input js-autosize markdown-area"
class=
"note-textarea js-gfm-input js-autosize markdown-area
js-note-text
"
data-supports-slash-commands=
"true"
data-supports-quick-actions=
"true"
aria-label=
"Description"
...
...
@@ -101,7 +128,7 @@ export default {
</button>
<button
@
click=
"cancelHandler()"
class=
"btn btn-nr btn-cancel"
class=
"btn btn-nr btn-cancel
note-edit-cancel
"
type=
"button"
>
Cancel
</button>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录