diff --git a/src/web/Manager.mjs b/src/web/Manager.mjs index e4b797cd..c3d981c4 100755 --- a/src/web/Manager.mjs +++ b/src/web/Manager.mjs @@ -148,7 +148,7 @@ class Manager { document.getElementById("edit-favourites").addEventListener("click", this.ops.editFavouritesClick.bind(this.ops)); document.getElementById("save-favourites").addEventListener("click", this.ops.saveFavouritesClick.bind(this.ops)); document.getElementById("categories").addEventListener("keydown", this.ops.onKeyPress.bind(this.ops)); - this.addDynamicListener(".op-list li.operation","keydown", this.ops.keyboardPopulateRecipe.bind(this.ops)); + this.addDynamicListener(".op-list li.operation", "keydown", this.ops.keyboardPopulateRecipe.bind(this.ops)); document.getElementById("reset-favourites").addEventListener("click", this.ops.resetFavouritesClick.bind(this.ops)); this.addDynamicListener(".op-list", "oplistcreate", this.ops.opListCreate, this.ops); this.addDynamicListener("li.operation", "operationadd", this.recipe.opAdd, this.recipe); diff --git a/src/web/waiters/OperationsWaiter.mjs b/src/web/waiters/OperationsWaiter.mjs index 2e8fcd87..cc76ec7d 100755 --- a/src/web/waiters/OperationsWaiter.mjs +++ b/src/web/waiters/OperationsWaiter.mjs @@ -283,50 +283,50 @@ class OperationsWaiter { this.manager.recipe.initialiseOperationDragNDrop(); } - /** - * Handler for on key press events. - * Get the children of categories and add event listener to them. - */ + /** + * Handler for on key press events. + * Get the children of categories and add event listener to them. + */ onKeyPress() { const cat = document.getElementById("categories"); - for (let i = 0; i < cat.children.length; i++){ + for (let i = 0; i < cat.children.length; i++) { cat.children[i].addEventListener("keydown", this.keyboardEventHandler, false); - }; + } } - /** - * Handler for keyboard enter/space events. - * Uses "Enter" or "Space" to mimic the click function and open the operations panels . - * @param {Event} ev - */ - keyboardEventHandler(ev){ - if(ev.key === "Enter" || ev.key === "Space" || ev.key === " " ){ + /** + * Handler for keyboard enter/space events. + * Uses "Enter" or "Space" to mimic the click function and open the operations panels . + * @param {Event} ev + */ + keyboardEventHandler(ev) { + if (ev.key === "Enter" || ev.key === "Space" || ev.key === " ") { ev.preventDefault(); - for(let i = 0; i < ev.target.childNodes.length; i++){ - let targetChild = ev.target.childNodes[i].classList; - if(targetChild !== undefined && targetChild.value.includes("panel-collapse collapse")){ - if(!targetChild.contains("show")){ + for (let i = 0; i < ev.target.childNodes.length; i++) { + const targetChild = ev.target.childNodes[i].classList; + if (targetChild !== undefined && targetChild.value.includes("panel-collapse collapse")) { + if (!targetChild.contains("show")) { targetChild.add("show"); - }else if(targetChild.contains("show")){ + } else if (targetChild.contains("show")) { targetChild.remove("show"); } - - }; - + + } + } } - }; + } /** - * Handler to populate recipe. - * Get the children of op-list and add event listener to them. + * Handler to populate recipe. + * Get the children of op-list and add event listener to them. */ - operationPopulateRecipe(){ - let cat = document.querySelectorAll(".op-list li.operation"); - for(let i = 0; i < cat.children.length; i++){ + operationPopulateRecipe() { + const cat = document.querySelectorAll(".op-list li.operation"); + for (let i = 0; i < cat.children.length; i++) { cat.children[i].addEventListener("keydown", this.keyboardPopulateRecipe, false); - }; + } } @@ -335,13 +335,13 @@ class OperationsWaiter { * Uses keyboard shortcut "CTRl + Enter" to mimic operationDblClick handler function * @param {Event} ev */ - keyboardPopulateRecipe(ev){ - if(ev.ctrlKey && ev.key === "Enter"){ - const li = ev.target + keyboardPopulateRecipe(ev) { + if (ev.ctrlKey && ev.key === "Enter") { + const li = ev.target; this.manager.recipe.addOperation(li.textContent); } } - + /** * Handler for reset favourites click events. * Resets favourites to their defaults.