Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
0ab8264e
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,发现更多精彩内容 >>
提交
0ab8264e
编写于
7月 01, 2016
作者:
P
Phil Hughes
提交者:
Douwe Maan
7月 24, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
VueJS updates
上级
70b46b28
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
13 addition
and
10 deletion
+13
-10
app/assets/javascripts/line_comments/application.js.coffee
app/assets/javascripts/line_comments/application.js.coffee
+6
-2
app/assets/javascripts/line_comments/components/resolve_all.js.coffee
...avascripts/line_comments/components/resolve_all.js.coffee
+1
-3
app/assets/javascripts/line_comments/components/resolve_btn.js.coffee
...avascripts/line_comments/components/resolve_btn.js.coffee
+4
-3
app/views/projects/merge_requests/_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+1
-1
app/views/projects/notes/_note.html.haml
app/views/projects/notes/_note.html.haml
+1
-1
未找到文件。
app/assets/javascripts/line_comments/application.js.coffee
浏览文件 @
0ab8264e
...
...
@@ -2,9 +2,13 @@
#= require_directory ./stores
#= require_directory ./components
$
-
>
new
Vue
$
=
>
@
DiffNotesApp
=
new
Vue
el
:
'#notes'
components
:
'resolve-btn'
:
ResolveBtn
new
Vue
el
:
'#resolve-all-app'
components
:
'resolve-all'
:
ResolveAll
app/assets/javascripts/line_comments/components/resolve_all.js.coffee
浏览文件 @
0ab8264e
ResolveAll
=
Vue
.
extend
@
ResolveAll
=
Vue
.
extend
data
:
->
{
comments
:
CommentsStore
.
state
}
computed
:
...
...
@@ -15,5 +15,3 @@ ResolveAll = Vue.extend
updateAll
:
->
resolveAll
=
!
(
this
.
resolved
is
this
.
commentsCount
)
CommentsStore
.
updateAll
(
resolveAll
)
Vue
.
component
'resolve-all'
,
ResolveAll
app/assets/javascripts/line_comments/components/resolve_btn.js.coffee
浏览文件 @
0ab8264e
ResolveBtn
=
Vue
.
extend
@
ResolveBtn
=
Vue
.
extend
props
:
noteId
:
Number
resolved
:
Boolean
...
...
@@ -18,7 +18,8 @@ ResolveBtn = Vue.extend
this
.
$nextTick
this
.
updateTooltip
compiled
:
->
$
(
this
.
$el
).
tooltip
()
destroyed
:
->
console
.
log
this
.
noteId
created
:
->
console
.
log
this
.
noteId
CommentsStore
.
create
(
this
.
noteId
,
this
.
resolved
)
Vue
.
component
'resolve-btn'
,
ResolveBtn
app/views/projects/merge_requests/_show.html.haml
浏览文件 @
0ab8264e
...
...
@@ -47,7 +47,7 @@
#resolve-all-app
{
"v-cloak"
=>
true
}
%resolve-all
{
"inline-template"
=>
true
}
.line-resolve-all
{
"v-show"
=>
"commentsCount > 0"
}
%button
.btn.btn-gray
{
type:
"button"
,
"aria-label"
=>
"Resolve all"
,
"
v-on:
click"
=>
"updateAll"
}
%button
.btn.btn-gray
{
type:
"button"
,
"aria-label"
=>
"Resolve all"
,
"
@
click"
=>
"updateAll"
}
{{ buttonText }}
%span
.line-resolve-text
{{ resolved }}/{{ commentsCount }} comments resolved
...
...
app/views/projects/notes/_note.html.haml
浏览文件 @
0ab8264e
...
...
@@ -22,7 +22,7 @@
%span
.note-role.hidden-xs
=
access
-
unless
note
.
system
%resolve-btn
{
":note-id"
=>
note
.
id
,
":resolved"
=>
"false"
,
"inline-template"
=>
true
}
%button
.note-action-button.line-resolve-btn
{
type:
"button"
,
"
v-bind:class"
=>
"{ 'is-active': isResolved }"
,
"v-bind:aria-label"
=>
"buttonText"
,
"v-on:click"
=>
"resolve"
,
"v-bind
:title"
=>
"buttonText"
}
%button
.note-action-button.line-resolve-btn
{
type:
"button"
,
"
:class"
=>
"{ 'is-active': isResolved }"
,
":aria-label"
=>
"buttonText"
,
"@click"
=>
"resolve"
,
"
:title"
=>
"buttonText"
}
=
icon
(
"check"
)
-
if
current_user
and
not
note
.
system
=
link_to
'#'
,
title:
'Award Emoji'
,
class:
'note-action-button note-emoji-button js-add-award js-note-emoji'
,
data:
{
position:
'right'
}
do
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录