Skip to content

#36 Fix the modal display when there is no category with flavor #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
minhduchoang195 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

#36 Fix the modal display when there is no category with flavor #41

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion amd/src/ui.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,8 @@ const displayDialogue = async(editor) => {
if (soleCategories.length > 0 || selectCategories.length > 0) {
const savedCategory = currentCategoryId;
const savedFlavor = lastFlavor[currentCategoryId];
if (soleCategories.length == 0 || soleCategories[0].displayorder > selectCategories[0].displayorder) {
if ((selectCategories.length > 0)
&& (soleCategories.length == 0 || soleCategories[0].displayorder > selectCategories[0].displayorder)) {
selectCategories[0].click();
} else {
soleCategories[0].click();
Expand Down Expand Up @@ -236,6 +237,11 @@ const handleCategoryFlavorClick = (event, modal) => {

const componentButtons = modal.getRoot()[0].querySelectorAll('.elements-buttons-preview button');
componentButtons.forEach(componentButton => {
// Remove previous flavor.
if (componentButton.dataset.flavor != undefined) {
componentButton.classList.remove(componentButton.dataset.flavor);
}
componentButton.classList.add(currentFlavor);
componentButton.dataset.flavor = currentFlavor;
if (
(componentButton.dataset.flavorlist == '' || componentButton.dataset.flavorlist.split(',').includes(currentFlavor)) &&
Expand Down