Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
e28fb834
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,发现更多精彩内容 >>
提交
e28fb834
编写于
7月 15, 2016
作者:
P
Phil Hughes
提交者:
Douwe Maan
7月 24, 2016
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fixed loading icon not working on resovle all buttons
上级
e7626eb0
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
10 addition
and
6 deletion
+10
-6
app/assets/javascripts/line_comments/components/resolve_all.js.coffee
...avascripts/line_comments/components/resolve_all.js.coffee
+4
-3
app/assets/javascripts/line_comments/services/resolve.js.coffee
...sets/javascripts/line_comments/services/resolve.js.coffee
+2
-2
app/assets/javascripts/line_comments/stores/comments.js.coffee
...ssets/javascripts/line_comments/stores/comments.js.coffee
+4
-1
未找到文件。
app/assets/javascripts/line_comments/components/resolve_all.js.coffee
浏览文件 @
e28fb834
...
@@ -4,16 +4,17 @@
...
@@ -4,16 +4,17 @@
namespace
:
String
namespace
:
String
data
:
->
data
:
->
comments
:
CommentsStore
.
state
comments
:
CommentsStore
.
state
loadingObject
:
CommentsStore
.
loading
computed
:
computed
:
allResolved
:
->
allResolved
:
->
isResolved
=
true
isResolved
=
true
for
noteId
,
resolved
of
this
.
comments
[
this
.
discussionId
]
for
noteId
,
resolved
of
this
.
comments
[
this
.
discussionId
]
unless
noteId
is
"loading"
isResolved
=
false
unless
resolved
isResolved
=
false
unless
resolved
isResolved
isResolved
buttonText
:
->
buttonText
:
->
if
this
.
allResolved
then
"Un-resolve all"
else
"Resolve all"
if
this
.
allResolved
then
"Un-resolve all"
else
"Resolve all"
loading
:
->
this
.
comments
[
this
.
discussionId
].
loading
loading
:
->
this
.
loadingObject
[
this
.
discussionId
]
methods
:
methods
:
resolve
:
->
resolve
:
->
ResolveService
ResolveService
...
...
app/assets/javascripts/line_comments/services/resolve.js.coffee
浏览文件 @
e28fb834
...
@@ -32,7 +32,7 @@ class ResolveService
...
@@ -32,7 +32,7 @@ class ResolveService
for
noteId
,
resolved
of
CommentsStore
.
state
[
discussionId
]
for
noteId
,
resolved
of
CommentsStore
.
state
[
discussionId
]
ids
.
push
(
noteId
)
if
resolved
is
allResolve
ids
.
push
(
noteId
)
if
resolved
is
allResolve
CommentsStore
.
state
[
discussionId
].
loading
=
true
CommentsStore
.
loading
[
discussionId
]
=
true
@
resource
@
resource
.
all
({},
{
ids
:
ids
,
discussion
:
discussionId
,
resolved
:
!
allResolve
})
.
all
({},
{
ids
:
ids
,
discussion
:
discussionId
,
resolved
:
!
allResolve
})
.
then
(
response
)
->
.
then
(
response
)
->
...
@@ -40,6 +40,6 @@ class ResolveService
...
@@ -40,6 +40,6 @@ class ResolveService
for
noteId
in
ids
for
noteId
in
ids
CommentsStore
.
update
(
discussionId
,
noteId
,
!
allResolve
)
CommentsStore
.
update
(
discussionId
,
noteId
,
!
allResolve
)
CommentsStore
.
state
[
discussionId
].
loading
=
false
CommentsStore
.
loading
[
discussionId
]
=
false
@
ResolveService
=
new
ResolveService
()
@
ResolveService
=
new
ResolveService
()
app/assets/javascripts/line_comments/stores/comments.js.coffee
浏览文件 @
e28fb834
@
CommentsStore
=
@
CommentsStore
=
state
:
{}
state
:
{}
loading
:
{}
get
:
(
discussionId
,
noteId
)
->
get
:
(
discussionId
,
noteId
)
->
this
.
state
[
discussionId
][
noteId
]
this
.
state
[
discussionId
][
noteId
]
create
:
(
discussionId
,
noteId
,
resolved
)
->
create
:
(
discussionId
,
noteId
,
resolved
)
->
unless
this
.
state
[
discussionId
]
?
unless
this
.
state
[
discussionId
]
?
Vue
.
set
(
this
.
state
,
discussionId
,
{
loading
:
false
})
Vue
.
set
(
this
.
state
,
discussionId
,
{})
Vue
.
set
(
this
.
loading
,
discussionId
,
false
)
Vue
.
set
(
this
.
state
[
discussionId
],
noteId
,
resolved
)
Vue
.
set
(
this
.
state
[
discussionId
],
noteId
,
resolved
)
update
:
(
discussionId
,
noteId
,
resolved
)
->
update
:
(
discussionId
,
noteId
,
resolved
)
->
...
@@ -14,3 +16,4 @@
...
@@ -14,3 +16,4 @@
if
Object
.
keys
(
this
.
state
[
discussionId
]).
length
is
0
if
Object
.
keys
(
this
.
state
[
discussionId
]).
length
is
0
Vue
.
delete
(
this
.
state
,
discussionId
)
Vue
.
delete
(
this
.
state
,
discussionId
)
Vue
.
delete
(
this
.
loading
,
discussionId
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录