BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
3d4d9c5a
Commit
3d4d9c5a
authored
Jul 09, 2017
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
IssueNotesRefactor: Fix adding main note awards.
parent
d9a9c33b
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
awards_handler.js
app/assets/javascripts/awards_handler.js
+8
-2
show.html.haml
app/views/projects/issues/show.html.haml
+1
-1
No files found.
app/assets/javascripts/awards_handler.js
View file @
3d4d9c5a
...
...
@@ -235,7 +235,9 @@ class AwardsHandler {
}
addAward
(
votesBlock
,
awardUrl
,
emoji
,
checkMutuality
,
callback
)
{
if
(
this
.
isInIssuePage
())
{
const
isMainAwardsBlock
=
votesBlock
.
closest
(
'.js-issue-note-awards'
).
length
;
if
(
this
.
isInIssuePage
()
&&
!
isMainAwardsBlock
)
{
const
id
=
votesBlock
[
0
].
id
.
replace
(
'note_'
,
''
);
$
(
'.emoji-menu'
).
removeClass
(
'is-visible'
);
...
...
@@ -288,7 +290,11 @@ class AwardsHandler {
getVotesBlock
()
{
if
(
this
.
isInIssuePage
())
{
return
$
(
'.js-add-award.is-active'
).
closest
(
'.note.timeline-entry'
);
const
$el
=
$
(
'.js-add-award.is-active'
).
closest
(
'.note.timeline-entry'
);
if
(
$el
.
length
)
{
return
$el
;
}
}
const
currentBlock
=
$
(
'.js-awards-block.current'
);
...
...
app/views/projects/issues/show.html.haml
View file @
3d4d9c5a
...
...
@@ -72,7 +72,7 @@
.content-block.emoji-block
.row
.col-sm-8
.col-sm-8
.js-issue-note-awards
=
render
'award_emoji/awards_block'
,
awardable:
@issue
,
inline:
true
.col-sm-4.new-branch-col
=
render
'new_branch'
unless
@issue
.
confidential?
...
...
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