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
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
59b34188
Commit
59b34188
authored
May 30, 2016
by
Fatih Acet
Committed by
Z.J. van de Weg
Jun 06, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Animate emoji when rendered.
parent
ce572913
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
1 deletion
+12
-1
app/assets/javascripts/awards_handler.coffee
app/assets/javascripts/awards_handler.coffee
+12
-1
No files found.
app/assets/javascripts/awards_handler.coffee
View file @
59b34188
...
@@ -126,6 +126,7 @@ class @AwardsHandler
...
@@ -126,6 +126,7 @@ class @AwardsHandler
counter
.
text
parseInt
(
counter
.
text
())
+
1
counter
.
text
parseInt
(
counter
.
text
())
+
1
$emojiBtn
.
addClass
'active'
$emojiBtn
.
addClass
'active'
@
addMeToUserList
votesBlock
,
emoji
@
addMeToUserList
votesBlock
,
emoji
@
animateEmoji
$emojiBtn
else
else
votesBlock
.
removeClass
'hidden'
votesBlock
.
removeClass
'hidden'
@
createEmoji
votesBlock
,
emoji
@
createEmoji
votesBlock
,
emoji
...
@@ -242,15 +243,25 @@ class @AwardsHandler
...
@@ -242,15 +243,25 @@ class @AwardsHandler
<span class='award-control-text js-counter'>1</span>
<span class='award-control-text js-counter'>1</span>
</button>"
</button>"
emoji_node
=
$
(
buttonHtml
)
$emojiButton
=
$
buttonHtml
emoji_node
=
$emojiButton
.
insertBefore
votesBlock
.
find
'.js-award-holder:not(.js-award-action-btn)'
.
insertBefore
votesBlock
.
find
'.js-award-holder:not(.js-award-action-btn)'
.
find
'.emoji-icon'
.
find
'.emoji-icon'
.
data
'emoji'
,
emoji
.
data
'emoji'
,
emoji
@
animateEmoji
$emojiButton
$
(
'.award-control'
).
tooltip
()
$
(
'.award-control'
).
tooltip
()
votesBlock
.
removeClass
'current'
votesBlock
.
removeClass
'current'
animateEmoji
:
(
$emoji
)
->
className
=
'pulse animated'
$emoji
.
addClass
className
setTimeout
(
->
$emoji
.
removeClass
className
),
321
createEmoji
:
(
votesBlock
,
emoji
)
->
createEmoji
:
(
votesBlock
,
emoji
)
->
if
$
(
'.emoji-menu'
).
length
if
$
(
'.emoji-menu'
).
length
...
...
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