Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
58b560fa
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,发现更多精彩内容 >>
提交
58b560fa
编写于
5月 05, 2017
作者:
R
Regis
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
resolve discussion
上级
5fb98734
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
12 addition
and
18 deletion
+12
-18
app/assets/javascripts/issue_show/index.js
app/assets/javascripts/issue_show/index.js
+2
-2
app/assets/javascripts/issue_show/issue_title_description.vue
...assets/javascripts/issue_show/issue_title_description.vue
+9
-9
app/views/projects/issues/_issue.html.haml
app/views/projects/issues/_issue.html.haml
+0
-4
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+1
-1
spec/javascripts/issue_show/issue_title_description_spec.js
spec/javascripts/issue_show/issue_title_description_spec.js
+0
-2
未找到文件。
app/assets/javascripts/issue_show/index.js
浏览文件 @
58b560fa
...
...
@@ -4,13 +4,13 @@ import '../vue_shared/vue_resource_interceptor';
(()
=>
{
const
issueTitleData
=
document
.
querySelector
(
'
.issue-title-data
'
).
dataset
;
const
{
can
updateissue
,
endpoint
}
=
issueTitleData
;
const
{
can
UpdateTasksClass
,
endpoint
}
=
issueTitleData
;
const
vm
=
new
Vue
({
el
:
'
.issue-title-entrypoint
'
,
render
:
createElement
=>
createElement
(
IssueTitle
,
{
props
:
{
canUpdate
Issue
:
canupdateissue
,
canUpdate
TasksClass
,
endpoint
,
},
}),
...
...
app/assets/javascripts/issue_show/issue_title_description.vue
浏览文件 @
58b560fa
...
...
@@ -10,7 +10,7 @@ export default {
required
:
true
,
type
:
String
,
},
canUpdate
Issue
:
{
canUpdate
TasksClass
:
{
required
:
true
,
type
:
String
,
},
...
...
@@ -112,19 +112,16 @@ export default {
},
},
computed
:
{
descriptionClass
()
{
return
`description
${
this
.
canUpdateIssue
}
is-task-list-enabled`
;
},
titleAnimationCss
()
{
return
{
'
title
issue-realtime-pre-pulse
'
:
this
.
titleFlag
.
pre
,
'
title
issue-realtime-trigger-pulse
'
:
this
.
titleFlag
.
pulse
,
'
issue-realtime-pre-pulse
'
:
this
.
titleFlag
.
pre
,
'
issue-realtime-trigger-pulse
'
:
this
.
titleFlag
.
pulse
,
};
},
descriptionAnimationCss
()
{
return
{
'
wiki
issue-realtime-pre-pulse
'
:
this
.
descriptionFlag
.
pre
,
'
wiki
issue-realtime-trigger-pulse
'
:
this
.
descriptionFlag
.
pulse
,
'
issue-realtime-pre-pulse
'
:
this
.
descriptionFlag
.
pre
,
'
issue-realtime-trigger-pulse
'
:
this
.
descriptionFlag
.
pulse
,
};
},
},
...
...
@@ -165,16 +162,19 @@ export default {
<
template
>
<div>
<h2
class=
"title"
:class=
"titleAnimationCss"
ref=
"issue-title"
v-html=
"title"
>
</h2>
<div
:class=
"descriptionClass"
class=
"description is-task-list-enabled"
:class=
"canUpdateTasksClass"
v-if=
"description"
>
<div
class=
"wiki"
:class=
"descriptionAnimationCss"
v-html=
"description"
ref=
"issue-content-container-gfm-entry"
...
...
app/views/projects/issues/_issue.html.haml
浏览文件 @
58b560fa
...
...
@@ -16,10 +16,6 @@
-
if
issue
.
assignee
%li
=
link_to_member
(
@project
,
issue
.
assignee
,
name:
false
,
title:
"Assigned to :name"
)
-
if
issue
.
tasks?
%span
.task-status
=
issue
.
task_status
=
render
'shared/issuable_meta_data'
,
issuable:
issue
...
...
app/views/projects/issues/show.html.haml
浏览文件 @
58b560fa
...
...
@@ -52,7 +52,7 @@
.issue-details.issuable-details
.detail-page-description.content-block
.issue-title-data.hidden
{
"data"
=>
{
"endpoint"
=>
rendered_title_namespace_project_issue_path
(
@project
.
namespace
,
@project
,
@issue
),
"can
UpdateIssue
"
=>
can?
(
current_user
,
:update_issue
,
@issue
)
?
'js-task-list-container'
:
''
,
"can
-update-tasks-class
"
=>
can?
(
current_user
,
:update_issue
,
@issue
)
?
'js-task-list-container'
:
''
,
}
}
.issue-title-entrypoint
...
...
spec/javascripts/issue_show/issue_title_description_spec.js
浏览文件 @
58b560fa
...
...
@@ -39,7 +39,6 @@ describe('Issue Title', () => {
},
}).
$mount
();
// need setTimeout because of api call/v-html
setTimeout
(()
=>
{
expect
(
document
.
querySelector
(
'
title
'
).
innerText
).
toContain
(
'
this is a title (#1)
'
);
expect
(
issueShowComponent
.
$el
.
querySelector
(
'
.title
'
).
innerHTML
).
toContain
(
'
<p>this is a title</p>
'
);
...
...
@@ -57,6 +56,5 @@ describe('Issue Title', () => {
done
();
});
});
// 10ms is just long enough for the update hook to fire
});
});
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录