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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
94826d9a
Commit
94826d9a
authored
Jun 10, 2016
by
Fatih Acet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Minor MR comment fixes.
yes -> true no -> false . frequent -> .frequent-emojis
parent
e885c2fd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
app/assets/javascripts/awards_handler.coffee
app/assets/javascripts/awards_handler.coffee
+6
-6
No files found.
app/assets/javascripts/awards_handler.coffee
View file @
94826d9a
...
...
@@ -100,7 +100,7 @@ class @AwardsHandler
$menu
.
css
(
css
)
addAward
:
(
votesBlock
,
awardUrl
,
emoji
,
checkMutuality
=
yes
,
callback
)
->
addAward
:
(
votesBlock
,
awardUrl
,
emoji
,
checkMutuality
=
true
,
callback
)
->
emoji
=
@
normilizeEmojiName
emoji
...
...
@@ -111,7 +111,7 @@ class @AwardsHandler
$
(
'.emoji-menu'
).
removeClass
'is-visible'
addAwardToEmojiBar
:
(
votesBlock
,
emoji
,
checkForMutuality
=
yes
)
->
addAwardToEmojiBar
:
(
votesBlock
,
emoji
,
checkForMutuality
=
true
)
->
@
checkMutuality
votesBlock
,
emoji
if
checkForMutuality
@
addEmojiToFrequentlyUsedList
emoji
...
...
@@ -153,7 +153,7 @@ class @AwardsHandler
if
isAlreadyVoted
@
showEmojiLoader
$emojiButton
@
addAward
votesBlock
,
awardUrl
,
mutualVote
,
no
,
->
@
addAward
votesBlock
,
awardUrl
,
mutualVote
,
false
,
->
$emojiButton
.
removeClass
'is-loading'
...
...
@@ -336,14 +336,14 @@ class @AwardsHandler
if
$
.
cookie
'frequently_used_emojis'
frequentlyUsedEmojis
=
@
getFrequentlyUsedEmojis
()
ul
=
$
(
"<ul class='clearfix emoji-menu-list frequent'>"
)
ul
=
$
(
"<ul class='clearfix emoji-menu-list frequent
-emojis
'>"
)
for
emoji
in
frequentlyUsedEmojis
$
(
".emoji-menu-content [data-emoji='
#{
emoji
}
']"
).
closest
(
'li'
).
clone
().
appendTo
(
ul
)
$
(
'input.emoji-search'
).
after
(
ul
).
after
(
$
(
'<h5>'
).
text
(
'Frequently used'
))
@
frequentEmojiBlockRendered
=
yes
@
frequentEmojiBlockRendered
=
true
setupSearch
:
->
...
...
@@ -367,4 +367,4 @@ class @AwardsHandler
searchEmojis
:
(
term
)
->
$
(
".emoji-menu-list:not(.frequent) [data-emoji*='
#{
term
}
']"
).
closest
(
'li'
).
clone
()
$
(
".emoji-menu-list:not(.frequent
-emojis
) [data-emoji*='
#{
term
}
']"
).
closest
(
'li'
).
clone
()
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