Commit 2d649256 authored by Eric Eastwood's avatar Eric Eastwood

Fix up potential for build finish event to fire for wrong menu

parent c4801e2a
...@@ -154,8 +154,7 @@ AwardsHandler.prototype.showEmojiMenu = function showEmojiMenu($addBtn) { ...@@ -154,8 +154,7 @@ AwardsHandler.prototype.showEmojiMenu = function showEmojiMenu($addBtn) {
}; };
// Create the emoji menu with the first category of emojis. // Create the emoji menu with the first category of emojis.
// Then after the emoji menu has been expanded(and CSS transition has ended), // Then render the remaining categories of emojis one by one to avoid jank.
// render the remaining categories of emojis one by one to avoid jank.
AwardsHandler.prototype.createEmojiMenu = function createEmojiMenu(callback) { AwardsHandler.prototype.createEmojiMenu = function createEmojiMenu(callback) {
if (this.isCreatingEmojiMenu) { if (this.isCreatingEmojiMenu) {
return; return;
...@@ -199,7 +198,8 @@ AwardsHandler ...@@ -199,7 +198,8 @@ AwardsHandler
// Avoid the jank and render the remaining categories separately // Avoid the jank and render the remaining categories separately
// This will take more time, but makes UI more responsive // 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 remainingCategories = Object.keys(categoryMap).slice(1);
const allCategoriesAddedPromise = remainingCategories.reduce( const allCategoriesAddedPromise = remainingCategories.reduce(
(promiseChain, categoryNameKey) => (promiseChain, categoryNameKey) =>
...@@ -222,7 +222,6 @@ AwardsHandler ...@@ -222,7 +222,6 @@ AwardsHandler
allCategoriesAddedPromise.then(() => { allCategoriesAddedPromise.then(() => {
// Used for tests // Used for tests
// We check for the menu in case it was destroyed in the meantime // We check for the menu in case it was destroyed in the meantime
const menu = document.querySelector('.emoji-menu');
if (menu) { if (menu) {
menu.dispatchEvent(new CustomEvent('build-emoji-menu-finish')); menu.dispatchEvent(new CustomEvent('build-emoji-menu-finish'));
} }
......
...@@ -216,7 +216,7 @@ const AwardsHandler = require('~/awards_handler'); ...@@ -216,7 +216,7 @@ const AwardsHandler = require('~/awards_handler');
}); });
}); });
describe('emoji menu', function() { describe('emoji menu', function() {
const emojiSelector = '[data-name=sunglasses]'; const emojiSelector = '[data-name="sunglasses"]';
const openEmojiMenuAndAddEmoji = function() { const openEmojiMenuAndAddEmoji = function() {
return openAndWaitForEmojiMenu() return openAndWaitForEmojiMenu()
.then(() => { .then(() => {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment