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
Jérome Perrin
gitlab-ce
Commits
527e7edb
Commit
527e7edb
authored
Jun 26, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
replace emojiAlias references with normalizeEmojiName helper
parent
82d67f70
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
5 deletions
+3
-5
app/assets/javascripts/behaviors/gl_emoji.js
app/assets/javascripts/behaviors/gl_emoji.js
+3
-5
No files found.
app/assets/javascripts/behaviors/gl_emoji.js
View file @
527e7edb
import
installCustomElements
from
'
document-register-element
'
;
import
installCustomElements
from
'
document-register-element
'
;
import
{
emojiMap
,
emojiAliases
,
isEmojiUnicodeSupported
,
getUnicodeSupportMap
}
from
'
../emoji
'
;
import
{
emojiMap
,
normalizeEmojiName
,
isEmojiUnicodeSupported
,
getUnicodeSupportMap
}
from
'
../emoji
'
;
installCustomElements
(
window
);
installCustomElements
(
window
);
...
@@ -10,8 +10,7 @@ function emojiImageTag(name, src) {
...
@@ -10,8 +10,7 @@ function emojiImageTag(name, src) {
}
}
function
assembleFallbackImageSrc
(
inputName
)
{
function
assembleFallbackImageSrc
(
inputName
)
{
let
name
=
Object
.
prototype
.
hasOwnProperty
.
call
(
emojiAliases
,
inputName
)
?
let
name
=
normalizeEmojiName
(
inputName
);
emojiAliases
[
inputName
]
:
inputName
;
let
emojiInfo
=
emojiMap
[
name
];
let
emojiInfo
=
emojiMap
[
name
];
// Fallback to question mark for unknown emojis
// Fallback to question mark for unknown emojis
if
(
!
emojiInfo
)
{
if
(
!
emojiInfo
)
{
...
@@ -25,8 +24,7 @@ function assembleFallbackImageSrc(inputName) {
...
@@ -25,8 +24,7 @@ function assembleFallbackImageSrc(inputName) {
function
glEmojiTag
(
inputName
,
options
)
{
function
glEmojiTag
(
inputName
,
options
)
{
const
opts
=
{
sprite
:
false
,
forceFallback
:
false
,
...
options
};
const
opts
=
{
sprite
:
false
,
forceFallback
:
false
,
...
options
};
let
name
=
Object
.
prototype
.
hasOwnProperty
.
call
(
emojiAliases
,
inputName
)
?
let
name
=
normalizeEmojiName
(
inputName
);
emojiAliases
[
inputName
]
:
inputName
;
let
emojiInfo
=
emojiMap
[
name
];
let
emojiInfo
=
emojiMap
[
name
];
// Fallback to question mark for unknown emojis
// Fallback to question mark for unknown emojis
if
(
!
emojiInfo
)
{
if
(
!
emojiInfo
)
{
...
...
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