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
Boxiang Sun
gitlab-ce
Commits
35ee21d9
Commit
35ee21d9
authored
7 years ago
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove problematic use of requestAnimationFrame
parent
f0a4b487
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
8 deletions
+2
-8
app/assets/javascripts/awards_handler.js
app/assets/javascripts/awards_handler.js
+2
-8
No files found.
app/assets/javascripts/awards_handler.js
View file @
35ee21d9
...
...
@@ -7,10 +7,6 @@ import { emojiMap, emojiAliases, isEmojiNameValid } from './emoji';
const
animationEndEventString
=
'
animationend webkitAnimationEnd MSAnimationEnd oAnimationEnd
'
;
const
transitionEndEventString
=
'
transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd
'
;
const
requestAnimationFrame
=
window
.
requestAnimationFrame
||
window
.
webkitRequestAnimationFrame
||
window
.
mozRequestAnimationFrame
||
window
.
setTimeout
;
const
FROM_SENTENCE_REGEX
=
/
(?:
, and | and |,
)
/
;
// For separating lists produced by ruby's Array#toSentence
...
...
@@ -74,9 +70,7 @@ export default class AwardsHandler {
this
.
registerEventListener
(
'
one
'
,
$
(
document
),
'
mouseenter focus
'
,
'
.js-add-award
'
,
'
mouseenter focus
'
,
()
=>
{
const
$menu
=
$
(
'
.emoji-menu
'
);
if
(
$menu
.
length
===
0
)
{
requestAnimationFrame
(()
=>
{
this
.
createEmojiMenu
();
});
setTimeout
(()
=>
this
.
createEmojiMenu
());
}
// Prebuild the categoryMap
categoryMap
=
categoryMap
||
buildCategoryMap
();
...
...
@@ -221,7 +215,7 @@ export default class AwardsHandler {
categoryLabelMap
[
categoryNameKey
],
emojisInCategory
,
);
requestAnimationFrame
(()
=>
{
setTimeout
(()
=>
{
emojiContentElement
.
insertAdjacentHTML
(
'
beforeend
'
,
categoryMarkup
);
resolve
();
});
...
...
This diff is collapsed.
Click to expand it.
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