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
73c5c001
Commit
73c5c001
authored
Jun 24, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
move emojiAlias logic into helper module
parent
a7b603a2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
16 deletions
+17
-16
awards_handler.js
app/assets/javascripts/awards_handler.js
+6
-16
index.js
app/assets/javascripts/emoji/index.js
+11
-0
No files found.
app/assets/javascripts/awards_handler.js
View file @
73c5c001
...
...
@@ -3,7 +3,7 @@
import
Cookies
from
'js-cookie'
;
import
{
glEmojiTag
}
from
'./behaviors/gl_emoji'
;
import
{
emojiMap
,
emojiAliase
s
,
isEmojiNameValid
,
normalizeEmojiName
}
from
'./emoji'
;
import
{
emojiMap
,
filterEmojiNamesByAlia
s
,
isEmojiNameValid
,
normalizeEmojiName
}
from
'./emoji'
;
const
animationEndEventString
=
'animationend webkitAnimationEnd MSAnimationEnd oAnimationEnd'
;
const
transitionEndEventString
=
'transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd'
;
...
...
@@ -511,21 +511,11 @@ export default class AwardsHandler {
}
}
findMatchingEmojiElements
(
term
)
{
const
safeTerm
=
term
.
toLowerCase
();
const
namesMatchingAlias
=
[];
Object
.
keys
(
emojiAliases
).
forEach
((
alias
)
=>
{
if
(
alias
.
indexOf
(
safeTerm
)
>=
0
)
{
namesMatchingAlias
.
push
(
emojiAliases
[
alias
]);
}
});
const
$matchingElements
=
namesMatchingAlias
.
concat
(
safeTerm
)
.
reduce
(
(
$result
,
searchTerm
)
=>
$result
.
add
(
$
(
`.emoji-menu-list:not(.frequent-emojis) [data-name*="
${
searchTerm
}
"]`
)),
$
([]),
);
findMatchingEmojiElements
(
query
)
{
const
emojiMatches
=
filterEmojiNamesByAlias
(
query
);
const
$emojiElements
=
$
(
'.emoji-menu-list:not(.frequent-emojis) [data-name]'
);
const
$matchingElements
=
$emojiElements
.
filter
((
i
,
elm
)
=>
emojiMatches
.
indexOf
(
elm
.
dataset
.
name
)
>=
0
);
return
$matchingElements
.
closest
(
'li'
).
clone
();
}
...
...
app/assets/javascripts/emoji/index.js
View file @
73c5c001
...
...
@@ -13,10 +13,21 @@ function isEmojiNameValid(name) {
return
validEmojiNames
.
indexOf
(
name
)
>=
0
;
}
function
filterEmojiNames
(
filter
)
{
const
match
=
filter
.
toLowerCase
();
return
validEmojiNames
.
filter
(
name
=>
name
.
indexOf
(
match
)
>=
0
);
}
function
filterEmojiNamesByAlias
(
filter
)
{
return
_
.
uniq
(
filterEmojiNames
(
filter
).
map
(
name
=>
normalizeEmojiName
(
name
)));
}
export
{
emojiMap
,
emojiAliases
,
normalizeEmojiName
,
filterEmojiNames
,
filterEmojiNamesByAlias
,
getUnicodeSupportMap
,
isEmojiNameValid
,
isEmojiUnicodeSupported
,
...
...
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