Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
b7a0044a
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b7a0044a
编写于
6月 24, 2017
作者:
M
Mike Greiling
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
move normalizeEmojiName method to emoji helper module
上级
35ee21d9
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
14 addition
and
20 deletion
+14
-20
app/assets/javascripts/awards_handler.js
app/assets/javascripts/awards_handler.js
+3
-8
app/assets/javascripts/emoji/index.js
app/assets/javascripts/emoji/index.js
+11
-1
app/assets/javascripts/emoji/is_emoji_name_valid.js
app/assets/javascripts/emoji/is_emoji_name_valid.js
+0
-11
未找到文件。
app/assets/javascripts/awards_handler.js
浏览文件 @
b7a0044a
...
...
@@ -3,7 +3,7 @@
import
Cookies
from
'
js-cookie
'
;
import
{
glEmojiTag
}
from
'
./behaviors/gl_emoji
'
;
import
{
emojiMap
,
emojiAliases
,
isEmojiNameValid
}
from
'
./emoji
'
;
import
{
emojiMap
,
emojiAliases
,
isEmojiNameValid
,
normalizeEmojiName
}
from
'
./emoji
'
;
const
animationEndEventString
=
'
animationend webkitAnimationEnd MSAnimationEnd oAnimationEnd
'
;
const
transitionEndEventString
=
'
transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd
'
;
...
...
@@ -65,7 +65,6 @@ function renderCategory(name, emojiList, opts = {}) {
export
default
class
AwardsHandler
{
constructor
()
{
this
.
eventListeners
=
[];
this
.
aliases
=
emojiAliases
;
// If the user shows intent let's pre-build the menu
this
.
registerEventListener
(
'
one
'
,
$
(
document
),
'
mouseenter focus
'
,
'
.js-add-award
'
,
'
mouseenter focus
'
,
()
=>
{
const
$menu
=
$
(
'
.emoji-menu
'
);
...
...
@@ -260,7 +259,7 @@ export default class AwardsHandler {
checkMutuality
,
callback
,
)
{
const
normalizedEmoji
=
this
.
normalizeEmojiName
(
emoji
);
const
normalizedEmoji
=
normalizeEmojiName
(
emoji
);
const
$emojiButton
=
this
.
findEmojiIcon
(
votesBlock
,
normalizedEmoji
).
parent
();
this
.
postEmoji
(
$emojiButton
,
awardUrl
,
normalizedEmoji
,
()
=>
{
this
.
addAwardToEmojiBar
(
votesBlock
,
normalizedEmoji
,
checkMutuality
);
...
...
@@ -279,7 +278,7 @@ export default class AwardsHandler {
this
.
checkMutuality
(
votesBlock
,
emoji
);
}
this
.
addEmojiToFrequentlyUsedList
(
emoji
);
const
normalizedEmoji
=
this
.
normalizeEmojiName
(
emoji
);
const
normalizedEmoji
=
normalizeEmojiName
(
emoji
);
const
$emojiButton
=
this
.
findEmojiIcon
(
votesBlock
,
normalizedEmoji
).
parent
();
if
(
$emojiButton
.
length
>
0
)
{
if
(
this
.
isActive
(
$emojiButton
))
{
...
...
@@ -469,10 +468,6 @@ export default class AwardsHandler {
return
$
(
'
body, html
'
).
animate
(
options
,
200
);
}
normalizeEmojiName
(
emoji
)
{
return
Object
.
prototype
.
hasOwnProperty
.
call
(
this
.
aliases
,
emoji
)
?
this
.
aliases
[
emoji
]
:
emoji
;
}
addEmojiToFrequentlyUsedList
(
emoji
)
{
if
(
isEmojiNameValid
(
emoji
))
{
this
.
frequentlyUsedEmojis
=
_
.
uniq
(
this
.
getFrequentlyUsedEmojis
().
concat
(
emoji
));
...
...
app/assets/javascripts/emoji/index.js
浏览文件 @
b7a0044a
import
emojiMap
from
'
emojis/digests.json
'
;
import
emojiAliases
from
'
emojis/aliases.json
'
;
import
getUnicodeSupportMap
from
'
./unicode_support_map
'
;
import
isEmojiNameValid
from
'
./is_emoji_name_valid
'
;
import
isEmojiUnicodeSupported
from
'
./is_emoji_unicode_supported
'
;
const
validEmojiNames
=
[...
Object
.
keys
(
emojiMap
),
...
Object
.
keys
(
emojiAliases
)];
function
normalizeEmojiName
(
name
)
{
return
Object
.
prototype
.
hasOwnProperty
.
call
(
emojiAliases
,
name
)
?
emojiAliases
[
name
]
:
name
;
}
function
isEmojiNameValid
(
name
)
{
return
validEmojiNames
.
indexOf
(
name
)
>=
0
;
}
export
{
emojiMap
,
emojiAliases
,
normalizeEmojiName
,
getUnicodeSupportMap
,
isEmojiNameValid
,
isEmojiUnicodeSupported
,
...
...
app/assets/javascripts/emoji/is_emoji_name_valid.js
已删除
100644 → 0
浏览文件 @
35ee21d9
import
emojiMap
from
'
emojis/digests.json
'
;
import
emojiAliases
from
'
emojis/aliases.json
'
;
function
isEmojiNameValid
(
inputName
)
{
const
name
=
Object
.
prototype
.
hasOwnProperty
.
call
(
emojiAliases
,
inputName
)
?
emojiAliases
[
inputName
]
:
inputName
;
return
name
&&
emojiMap
[
name
];
}
export
default
isEmojiNameValid
;
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录