Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
5ec7a40b
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,发现更多精彩内容 >>
提交
5ec7a40b
编写于
7月 26, 2016
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Added jump to next discussion button
上级
f4746d01
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
42 addition
and
4 deletion
+42
-4
app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6
...vascripts/diff_notes/components/jump_to_discussion.js.es6
+35
-0
app/assets/javascripts/diff_notes/components/resolve_count.js.es6
...ts/javascripts/diff_notes/components/resolve_count.js.es6
+3
-3
app/views/projects/merge_requests/_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+4
-1
未找到文件。
app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6
0 → 100644
浏览文件 @
5ec7a40b
(() => {
JumpToDiscussion = Vue.extend({
data: function () {
return {
discussions: CommentsStore.state,
};
},
methods: {
jumpToNextUnresolvedDiscussion: function () {
let nextUnresolvedDiscussionId;
for (const discussionId in this.discussions) {
const discussion = this.discussions[discussionId];
for (const noteId in discussion) {
const note = discussion[noteId];
if (!note.resolved) {
nextUnresolvedDiscussionId = discussionId;
break;
}
}
if (nextUnresolvedDiscussionId) break;
}
$.scrollTo(`.${nextUnresolvedDiscussionId}`, {
offset: -($('.navbar-gitlab').outerHeight() + $('.layout-nav').outerHeight())
});
},
}
});
Vue.component('jump-to-discussion', JumpToDiscussion);
}());
app/assets/javascripts/diff_notes/components/resolve_count.js.es6
浏览文件 @
5ec7a40b
...
...
@@ -10,8 +10,8 @@
resolved: function () {
let resolvedCount = 0;
for (const discussionId in this.
comment
s) {
const comments = this.
comment
s[discussionId];
for (const discussionId in this.
discussion
s) {
const comments = this.
discussion
s[discussionId];
let resolved = true;
for (const noteId in comments) {
...
...
@@ -33,7 +33,7 @@
return Object.keys(this.discussions).length;
},
allResolved: function () {
return this.resolved === this.
comments
Count;
return this.resolved === this.
discussion
Count;
}
}
});
...
...
app/views/projects/merge_requests/_show.html.haml
浏览文件 @
5ec7a40b
...
...
@@ -47,9 +47,12 @@
-
if
current_user
#resolve-count-app
{
"v-cloak"
=>
true
}
%resolve-count
{
"inline-template"
=>
true
}
.line-resolve-all
{
"v-show"
=>
"
comments
Count > 0"
}
.line-resolve-all
{
"v-show"
=>
"
discussion
Count > 0"
}
%span
.line-resolve-text
{{ resolved }}/{{ discussionCount }} discussions resolved
%jump-to-discussion
{
"inline-template"
=>
true
}
%button
.btn.btn-default.has-tooltip
{
"@click"
=>
"jumpToNextUnresolvedDiscussion"
,
title:
"Jump to next unresolved discussion"
,
data:
{
container:
"body"
}
}
=
icon
(
"caret-down"
)
-
if
@commits_count
.
nonzero?
%ul
.merge-request-tabs.nav-links.no-top.no-bottom
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录