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
13f7ba05
Commit
13f7ba05
authored
Apr 22, 2016
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed usage of normilizeEmojiName method
Fixed some Ruby based on feedback
parent
319c9360
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
7 deletions
+1
-7
app/assets/javascripts/awards_handler.coffee
app/assets/javascripts/awards_handler.coffee
+0
-5
lib/award_emoji.rb
lib/award_emoji.rb
+1
-2
No files found.
app/assets/javascripts/awards_handler.coffee
View file @
13f7ba05
...
...
@@ -55,7 +55,6 @@ class @AwardsHandler
,
200
addAward
:
(
emoji
)
->
emoji
=
@
normilizeEmojiName
(
emoji
)
@
postEmoji
emoji
,
=>
@
addAwardToEmojiBar
(
emoji
)
...
...
@@ -64,7 +63,6 @@ class @AwardsHandler
addAwardToEmojiBar
:
(
emoji
)
->
@
addEmojiToFrequentlyUsedList
(
emoji
)
emoji
=
@
normilizeEmojiName
(
emoji
)
if
@
exist
(
emoji
)
if
@
isActive
(
emoji
)
@
decrementCounter
(
emoji
)
...
...
@@ -165,9 +163,6 @@ class @AwardsHandler
scrollTop
:
$
(
'.awards'
).
offset
().
top
-
80
},
200
)
normilizeEmojiName
:
(
emoji
)
->
emoji
addEmojiToFrequentlyUsedList
:
(
emoji
)
->
frequently_used_emojis
=
@
getFrequentlyUsedEmojis
()
frequently_used_emojis
.
push
(
emoji
)
...
...
lib/award_emoji.rb
View file @
13f7ba05
...
...
@@ -53,8 +53,7 @@ class AwardEmoji
end
def
self
.
unicode
emojis
emojis
.
map
{
|
key
,
value
|
{
key
=>
emojis
[
key
][
"unicode"
]
}
}.
inject
(
:merge!
)
@unicode
||=
emojis
.
map
{
|
key
,
value
|
{
key
=>
emojis
[
key
][
"unicode"
]
}
}.
inject
(
:merge!
)
end
def
self
.
aliases
...
...
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