Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
a8927a75
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,发现更多精彩内容 >>
提交
a8927a75
编写于
7月 04, 2016
作者:
P
Phil Hughes
提交者:
Douwe Maan
7月 24, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed issue when adding or deleting through jQuery
上级
0ab8264e
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
14 addition
and
3 deletion
+14
-3
app/assets/javascripts/line_comments/components/resolve_btn.js.coffee
...avascripts/line_comments/components/resolve_btn.js.coffee
+1
-2
app/assets/javascripts/line_comments/stores/comments.js.coffee
...ssets/javascripts/line_comments/stores/comments.js.coffee
+2
-0
app/assets/javascripts/notes.js.coffee
app/assets/javascripts/notes.js.coffee
+10
-0
app/views/projects/notes/_note.html.haml
app/views/projects/notes/_note.html.haml
+1
-1
未找到文件。
app/assets/javascripts/line_comments/components/resolve_btn.js.coffee
浏览文件 @
a8927a75
...
...
@@ -19,7 +19,6 @@
compiled
:
->
$
(
this
.
$el
).
tooltip
()
destroyed
:
->
console
.
log
this
.
noteId
CommentsStore
.
delete
(
this
.
noteId
)
created
:
->
console
.
log
this
.
noteId
CommentsStore
.
create
(
this
.
noteId
,
this
.
resolved
)
app/assets/javascripts/line_comments/stores/comments.js.coffee
浏览文件 @
a8927a75
...
...
@@ -4,6 +4,8 @@
Vue
.
set
(
this
.
state
,
id
,
resolved
)
update
:
(
id
,
resolved
)
->
this
.
state
[
id
]
=
resolved
delete
:
(
id
)
->
Vue
.
delete
(
this
.
state
,
id
)
updateAll
:
(
state
)
->
for
id
,
resolved
of
this
.
state
this
.
update
(
id
,
state
)
if
resolved
isnt
state
app/assets/javascripts/notes.js.coffee
浏览文件 @
a8927a75
...
...
@@ -271,6 +271,10 @@ class @Notes
# append new note to all matching discussions
discussionContainer
.
append
note_html
if
$
(
'resolve-btn'
).
length
and
DiffNotesApp
?
$
(
'resolve-btn'
).
each
->
DiffNotesApp
.
$compile
$
(
this
).
get
(
0
)
gl
.
utils
.
localTimeAgo
(
$
(
'.js-timeago'
,
note_html
),
false
)
@
updateNotesCount
(
1
)
...
...
@@ -465,6 +469,12 @@ class @Notes
note
=
$
(
el
)
notes
=
note
.
closest
(
".notes"
)
if
DiffNotesApp
?
ref
=
DiffNotesApp
.
$refs
[
"
#{
noteId
}
"
]
if
ref
?
ref
.
$destroy
(
true
)
# check if this is the last note for this line
if
notes
.
find
(
".note"
).
length
is
1
...
...
app/views/projects/notes/_note.html.haml
浏览文件 @
a8927a75
...
...
@@ -21,7 +21,7 @@
-
if
access
and
not
note
.
system
%span
.note-role.hidden-xs
=
access
-
unless
note
.
system
%resolve-btn
{
":note-id"
=>
note
.
id
,
":resolved"
=>
"false"
,
"inline-template"
=>
true
}
%resolve-btn
{
":note-id"
=>
note
.
id
,
":resolved"
=>
"false"
,
"inline-template"
=>
true
,
"v-ref:note_#{note.id}"
=>
true
}
%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
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录