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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
88e12ac9
Commit
88e12ac9
authored
Jun 27, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
revert removal of requestAnimationFrame and move to a separate MR/discussion
parent
a2a276a8
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
2 deletions
+8
-2
app/assets/javascripts/awards_handler.js
app/assets/javascripts/awards_handler.js
+8
-2
No files found.
app/assets/javascripts/awards_handler.js
View file @
88e12ac9
...
@@ -6,6 +6,10 @@ import * as Emoji from './emoji';
...
@@ -6,6 +6,10 @@ import * as Emoji from './emoji';
const
animationEndEventString
=
'
animationend webkitAnimationEnd MSAnimationEnd oAnimationEnd
'
;
const
animationEndEventString
=
'
animationend webkitAnimationEnd MSAnimationEnd oAnimationEnd
'
;
const
transitionEndEventString
=
'
transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd
'
;
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
const
FROM_SENTENCE_REGEX
=
/
(?:
, and | and |,
)
/
;
// For separating lists produced by ruby's Array#toSentence
...
@@ -46,7 +50,9 @@ export default class AwardsHandler {
...
@@ -46,7 +50,9 @@ export default class AwardsHandler {
this
.
registerEventListener
(
'
one
'
,
$
(
document
),
'
mouseenter focus
'
,
'
.js-add-award
'
,
'
mouseenter focus
'
,
()
=>
{
this
.
registerEventListener
(
'
one
'
,
$
(
document
),
'
mouseenter focus
'
,
'
.js-add-award
'
,
'
mouseenter focus
'
,
()
=>
{
const
$menu
=
$
(
'
.emoji-menu
'
);
const
$menu
=
$
(
'
.emoji-menu
'
);
if
(
$menu
.
length
===
0
)
{
if
(
$menu
.
length
===
0
)
{
setTimeout
(()
=>
this
.
createEmojiMenu
());
requestAnimationFrame
(()
=>
{
this
.
createEmojiMenu
();
});
}
}
});
});
this
.
registerEventListener
(
'
on
'
,
$
(
document
),
'
click
'
,
'
.js-add-award
'
,
(
e
)
=>
{
this
.
registerEventListener
(
'
on
'
,
$
(
document
),
'
click
'
,
'
.js-add-award
'
,
(
e
)
=>
{
...
@@ -189,7 +195,7 @@ export default class AwardsHandler {
...
@@ -189,7 +195,7 @@ export default class AwardsHandler {
categoryLabelMap
[
categoryNameKey
],
categoryLabelMap
[
categoryNameKey
],
emojisInCategory
,
emojisInCategory
,
);
);
setTimeout
(()
=>
{
requestAnimationFrame
(()
=>
{
emojiContentElement
.
insertAdjacentHTML
(
'
beforeend
'
,
categoryMarkup
);
emojiContentElement
.
insertAdjacentHTML
(
'
beforeend
'
,
categoryMarkup
);
resolve
();
resolve
();
});
});
...
...
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