Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
70b46b28
Commit
70b46b28
authored
Jul 01, 2016
by
Phil Hughes
Committed by
Douwe Maan
Jul 24, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve all comments button
Store that manages the state of each button
parent
af5fc6e2
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
71 additions
and
3 deletions
+71
-3
app/assets/javascripts/line_comments/application.js.coffee
app/assets/javascripts/line_comments/application.js.coffee
+4
-0
app/assets/javascripts/line_comments/components/resolve_all.js.coffee
...avascripts/line_comments/components/resolve_all.js.coffee
+19
-0
app/assets/javascripts/line_comments/components/resolve_btn.js.coffee
...avascripts/line_comments/components/resolve_btn.js.coffee
+24
-0
app/assets/javascripts/line_comments/stores/comments.js.coffee
...ssets/javascripts/line_comments/stores/comments.js.coffee
+9
-0
app/assets/stylesheets/behaviors.scss
app/assets/stylesheets/behaviors.scss
+4
-0
app/views/projects/merge_requests/_show.html.haml
app/views/projects/merge_requests/_show.html.haml
+9
-1
app/views/projects/notes/_note.html.haml
app/views/projects/notes/_note.html.haml
+2
-2
No files found.
app/assets/javascripts/line_comments/application.js.coffee
View file @
70b46b28
#= require vue
#= require vue
#= require_directory ./stores
#= require_directory ./components
#= require_directory ./components
$
->
$
->
new
Vue
new
Vue
el
:
'#notes'
el
:
'#notes'
new
Vue
el
:
'#resolve-all-app'
app/assets/javascripts/line_comments/components/resolve_all.js.coffee
0 → 100644
View file @
70b46b28
ResolveAll
=
Vue
.
extend
data
:
->
{
comments
:
CommentsStore
.
state
}
computed
:
resolved
:
->
resolvedCount
=
0
for
noteId
,
resolved
of
this
.
comments
resolvedCount
++
if
resolved
resolvedCount
commentsCount
:
->
Object
.
keys
(
this
.
comments
).
length
buttonText
:
->
if
this
.
resolved
is
this
.
commentsCount
then
'Un-resolve all'
else
'Resolve all'
methods
:
updateAll
:
->
resolveAll
=
!
(
this
.
resolved
is
this
.
commentsCount
)
CommentsStore
.
updateAll
(
resolveAll
)
Vue
.
component
'resolve-all'
,
ResolveAll
app/assets/javascripts/line_comments/components/
lin
e_btn.js.coffee
→
app/assets/javascripts/line_comments/components/
resolv
e_btn.js.coffee
View file @
70b46b28
Lin
eBtn
=
Vue
.
extend
Resolv
eBtn
=
Vue
.
extend
props
:
props
:
noteId
:
Number
noteId
:
Number
resolved
:
Boolean
resolved
:
Boolean
data
:
->
comments
:
CommentsStore
.
state
computed
:
computed
:
buttonText
:
->
buttonText
:
->
if
this
.
resolved
then
"Mark as un-resolved"
else
"Mark as resolved"
if
this
.
comments
[
this
.
noteId
]
then
"Mark as un-resolved"
else
"Mark as resolved"
isResolved
:
->
this
.
comments
[
this
.
noteId
]
methods
:
methods
:
updateTooltip
:
->
updateTooltip
:
->
$
(
this
.
$el
)
$
(
this
.
$el
)
.
tooltip
(
'hide'
)
.
tooltip
(
'hide'
)
.
tooltip
(
'fixTitle'
)
.
tooltip
(
'fixTitle'
)
resolve
:
->
resolve
:
->
this
.
$set
(
'resolved'
,
!
this
.
resolved
)
CommentsStore
.
update
(
this
.
noteId
,
!
this
.
comments
[
this
.
noteId
])
this
.
$nextTick
this
.
updateTooltip
this
.
$nextTick
this
.
updateTooltip
compiled
:
->
compiled
:
->
$
(
this
.
$el
).
tooltip
()
$
(
this
.
$el
).
tooltip
()
created
:
->
CommentsStore
.
create
(
this
.
noteId
,
this
.
resolved
)
Vue
.
component
'
line-btn'
,
Lin
eBtn
Vue
.
component
'
resolve-btn'
,
Resolv
eBtn
app/assets/javascripts/line_comments/stores/comments.js.coffee
0 → 100644
View file @
70b46b28
@
CommentsStore
=
state
:
{}
create
:
(
id
,
resolved
)
->
Vue
.
set
(
this
.
state
,
id
,
resolved
)
update
:
(
id
,
resolved
)
->
this
.
state
[
id
]
=
resolved
updateAll
:
(
state
)
->
for
id
,
resolved
of
this
.
state
this
.
update
(
id
,
state
)
if
resolved
isnt
state
app/assets/stylesheets/behaviors.scss
View file @
70b46b28
...
@@ -20,3 +20,7 @@
...
@@ -20,3 +20,7 @@
.turn-off
{
display
:
block
;
}
.turn-off
{
display
:
block
;
}
}
}
}
}
[
v-cloak
=
"true"
]
{
display
:
none
;
}
app/views/projects/merge_requests/_show.html.haml
View file @
70b46b28
...
@@ -44,7 +44,15 @@
...
@@ -44,7 +44,15 @@
=
succeed
'.'
do
=
succeed
'.'
do
=
link_to
"command line"
,
"#modal_merge_info"
,
class:
"how_to_merge_link vlink"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
=
link_to
"command line"
,
"#modal_merge_info"
,
class:
"how_to_merge_link vlink"
,
title:
"How To Merge"
,
"data-toggle"
=>
"modal"
-
if
@commits_count
.
nonzero?
#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"
}
{{ buttonText }}
%span
.line-resolve-text
{{ resolved }}/{{ commentsCount }} comments resolved
-
if
@commits
.
nonzero?
%ul
.merge-request-tabs.nav-links.no-top.no-bottom
%ul
.merge-request-tabs.nav-links.no-top.no-bottom
%li
.notes-tab
%li
.notes-tab
=
link_to
namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
),
data:
{
target:
'div#notes'
,
action:
'notes'
,
toggle:
'tab'
}
do
=
link_to
namespace_project_merge_request_path
(
@project
.
namespace
,
@project
,
@merge_request
),
data:
{
target:
'div#notes'
,
action:
'notes'
,
toggle:
'tab'
}
do
...
...
app/views/projects/notes/_note.html.haml
View file @
70b46b28
...
@@ -21,8 +21,8 @@
...
@@ -21,8 +21,8 @@
-
if
access
and
not
note
.
system
-
if
access
and
not
note
.
system
%span
.note-role.hidden-xs
=
access
%span
.note-role.hidden-xs
=
access
-
unless
note
.
system
-
unless
note
.
system
%
lin
e-btn
{
":note-id"
=>
note
.
id
,
":resolved"
=>
"false"
,
"inline-template"
=>
true
}
%
resolv
e-btn
{
":note-id"
=>
note
.
id
,
":resolved"
=>
"false"
,
"inline-template"
=>
true
}
%button
.note-action-button.line-resolve-btn
{
type:
"button"
,
"v-bind:class"
=>
"{ 'is-active':
r
esolved }"
,
"v-bind:aria-label"
=>
"buttonText"
,
"v-on:click"
=>
"resolve"
,
"v-bind:title"
=>
"buttonText"
}
%button
.note-action-button.line-resolve-btn
{
type:
"button"
,
"v-bind:class"
=>
"{ 'is-active':
isR
esolved }"
,
"v-bind:aria-label"
=>
"buttonText"
,
"v-on:click"
=>
"resolve"
,
"v-bind:title"
=>
"buttonText"
}
=
icon
(
"check"
)
=
icon
(
"check"
)
-
if
current_user
and
not
note
.
system
-
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
=
link_to
'#'
,
title:
'Award Emoji'
,
class:
'note-action-button note-emoji-button js-add-award js-note-emoji'
,
data:
{
position:
'right'
}
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment