Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
ce29e5cd
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,发现更多精彩内容 >>
提交
ce29e5cd
编写于
4月 29, 2015
作者:
R
Robert Speicher
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update task list behavior for Merge Requests
上级
92249756
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
27 addition
and
6 deletion
+27
-6
app/assets/javascripts/merge_request.js.coffee
app/assets/javascripts/merge_request.js.coffee
+23
-4
app/views/projects/merge_requests/show/_context.html.haml
app/views/projects/merge_requests/show/_context.html.haml
+1
-1
app/views/projects/merge_requests/show/_mr_box.html.haml
app/views/projects/merge_requests/show/_mr_box.html.haml
+3
-1
未找到文件。
app/assets/javascripts/merge_request.js.coffee
浏览文件 @
ce29e5cd
...
...
@@ -17,8 +17,11 @@ class @MergeRequest
disableButtonIfEmptyField
'#commit_message'
,
'.accept_merge_request'
# Prevent duplicate event bindings
@
disableTaskList
()
if
$
(
"a.btn-close"
).
length
$
(
"li.task-list-item input:checkbox"
).
prop
(
"disabled"
,
false
)
@
initTaskList
(
)
$
(
'.merge-request-details'
).
waitForImages
->
$
(
'.issuable-affix'
).
affix
offset
:
...
...
@@ -77,9 +80,6 @@ class @MergeRequest
this
.
$
(
'.remove_source_branch_in_progress'
).
hide
()
this
.
$
(
'.remove_source_branch_widget.failed'
).
show
()
$
(
'.task-list-item input:checkbox'
).
off
(
'change'
)
$
(
'.task-list-item input:checkbox'
).
change
(
'merge_request'
,
updateTaskState
)
activateTab
:
(
action
)
->
this
.
$
(
'.merge-request-tabs li'
).
removeClass
'active'
this
.
$
(
'.tab-content'
).
hide
()
...
...
@@ -156,3 +156,22 @@ class @MergeRequest
else
setTimeout
(
merge_request
.
mergeInProgress
,
3000
)
dataType
:
'json'
initTaskList
:
->
$
(
'.merge-request-details .js-task-list-container'
).
taskList
(
'enable'
)
$
(
document
).
on
'tasklist:changed'
,
'.merge-request-details .js-task-list-container'
,
@
updateTaskList
disableTaskList
:
->
$
(
'.merge-request-details .js-task-list-container'
).
taskList
(
'disable'
)
$
(
document
).
off
'tasklist:changed'
,
'.merge-request-details .js-task-list-container'
# TODO (rspeicher): Make the merge request description inline-editable like a
# note so that we can re-use its form here
updateTaskList
:
->
patchData
=
{}
patchData
[
'merge_request'
]
=
{
'description'
:
$
(
'.js-task-list-field'
,
this
).
val
()}
$
.
ajax
type
:
'PATCH'
url
:
$
(
'form.js-merge-request-update'
).
attr
(
'action'
)
data
:
patchData
app/views/projects/merge_requests/show/_context.html.haml
浏览文件 @
ce29e5cd
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@merge_request
],
remote:
true
,
html:
{
class:
'edit-merge_request inline-update'
}
do
|
f
|
=
form_for
[
@project
.
namespace
.
becomes
(
Namespace
),
@project
,
@merge_request
],
remote:
true
,
html:
{
class:
'edit-merge_request inline-update
js-merge-request-update
'
}
do
|
f
|
%div
.prepend-top-20
.issuable-context-title
%label
...
...
app/views/projects/merge_requests/show/_mr_box.html.haml
浏览文件 @
ce29e5cd
...
...
@@ -3,7 +3,9 @@
%div
-
if
@merge_request
.
description
.
present?
.description
.description
.js-task-list-container
.wiki
=
preserve
do
=
markdown
(
@merge_request
.
description
,
parse_tasks:
true
)
%textarea
.hidden.js-task-list-field
=
@merge_request
.
description
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录