Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
2d649256
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,体验更适合开发者的 AI 搜索 >>
提交
2d649256
编写于
3月 02, 2017
作者:
E
Eric Eastwood
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix up potential for build finish event to fire for wrong menu
上级
c4801e2a
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
4 addition
and
5 deletion
+4
-5
app/assets/javascripts/awards_handler.js
app/assets/javascripts/awards_handler.js
+3
-4
spec/javascripts/awards_handler_spec.js
spec/javascripts/awards_handler_spec.js
+1
-1
未找到文件。
app/assets/javascripts/awards_handler.js
浏览文件 @
2d649256
...
...
@@ -154,8 +154,7 @@ AwardsHandler.prototype.showEmojiMenu = function showEmojiMenu($addBtn) {
};
// Create the emoji menu with the first category of emojis.
// Then after the emoji menu has been expanded(and CSS transition has ended),
// render the remaining categories of emojis one by one to avoid jank.
// Then render the remaining categories of emojis one by one to avoid jank.
AwardsHandler
.
prototype
.
createEmojiMenu
=
function
createEmojiMenu
(
callback
)
{
if
(
this
.
isCreatingEmojiMenu
)
{
return
;
...
...
@@ -199,7 +198,8 @@ AwardsHandler
// Avoid the jank and render the remaining categories separately
// This will take more time, but makes UI more responsive
const
emojiContentElement
=
document
.
querySelector
(
'
.emoji-menu .emoji-menu-content
'
);
const
menu
=
document
.
querySelector
(
'
.emoji-menu
'
);
const
emojiContentElement
=
menu
.
querySelector
(
'
.emoji-menu-content
'
);
const
remainingCategories
=
Object
.
keys
(
categoryMap
).
slice
(
1
);
const
allCategoriesAddedPromise
=
remainingCategories
.
reduce
(
(
promiseChain
,
categoryNameKey
)
=>
...
...
@@ -222,7 +222,6 @@ AwardsHandler
allCategoriesAddedPromise
.
then
(()
=>
{
// Used for tests
// We check for the menu in case it was destroyed in the meantime
const
menu
=
document
.
querySelector
(
'
.emoji-menu
'
);
if
(
menu
)
{
menu
.
dispatchEvent
(
new
CustomEvent
(
'
build-emoji-menu-finish
'
));
}
...
...
spec/javascripts/awards_handler_spec.js
浏览文件 @
2d649256
...
...
@@ -216,7 +216,7 @@ const AwardsHandler = require('~/awards_handler');
});
});
describe
(
'
emoji menu
'
,
function
()
{
const
emojiSelector
=
'
[data-name=
sunglasses
]
'
;
const
emojiSelector
=
'
[data-name=
"sunglasses"
]
'
;
const
openEmojiMenuAndAddEmoji
=
function
()
{
return
openAndWaitForEmojiMenu
()
.
then
(()
=>
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录