diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-06-23 16:27:51 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-06-23 17:22:53 -0500 |
| commit | 41e2b4b555d470704b8a073a46ae3830903f8fd0 (patch) | |
| tree | e5b6fdfb8fe753d845d22f61be22b89024d435dd | |
| parent | 1f3225a5e375b370e76c98e47e8ed0b8bc67eac8 (diff) | |
| download | gitlab-ce-34263-fix-awards-handler-specs.tar.gz | |
prefer setTimeout of requestAnimationFrame for deferred awardsHandler category rendering34263-fix-awards-handler-specs
| -rw-r--r-- | app/assets/javascripts/awards_handler.js | 2 | ||||
| -rw-r--r-- | spec/javascripts/awards_handler_spec.js | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/awards_handler.js b/app/assets/javascripts/awards_handler.js index ebe722061d7..da75243267d 100644 --- a/app/assets/javascripts/awards_handler.js +++ b/app/assets/javascripts/awards_handler.js @@ -224,7 +224,7 @@ export default class AwardsHandler { categoryLabelMap[categoryNameKey], emojisInCategory, ); - requestAnimationFrame(() => { + setTimeout(() => { emojiContentElement.insertAdjacentHTML('beforeend', categoryMarkup); resolve(); }); diff --git a/spec/javascripts/awards_handler_spec.js b/spec/javascripts/awards_handler_spec.js index 3fc03324d16..d71ea4240d4 100644 --- a/spec/javascripts/awards_handler_spec.js +++ b/spec/javascripts/awards_handler_spec.js @@ -42,8 +42,7 @@ import '~/lib/utils/common_utils'; resolve(); } else { $('.js-add-award').eq(0).click(); - const $menu = $('.emoji-menu'); - $menu.one('build-emoji-menu-finish', () => { + $('.emoji-menu').one('build-emoji-menu-finish', () => { isEmojiMenuBuilt = true; resolve(); }); |