From fe7b5de4274e4a135b63c84f290260fc681af3ee Mon Sep 17 00:00:00 2001 From: Ethan Dalool Date: Thu, 3 Sep 2020 14:18:05 -0700 Subject: [PATCH] Replace many uses of forEach with for-of. --- frontends/etiquette_flask/static/js/common.js | 23 ++++++++++--------- .../etiquette_flask/static/js/spinner.js | 12 +++++----- .../etiquette_flask/templates/clipboard.html | 4 ++-- 3 files changed, 20 insertions(+), 19 deletions(-) diff --git a/frontends/etiquette_flask/static/js/common.js b/frontends/etiquette_flask/static/js/common.js index 3c9c54d..eca14d7 100644 --- a/frontends/etiquette_flask/static/js/common.js +++ b/frontends/etiquette_flask/static/js/common.js @@ -162,16 +162,17 @@ function init_atag_merge_params() href: "?orderby=date" Result: "?filter=hello&orderby=date" */ - var as = Array.from(document.getElementsByClassName("merge_params")); page_params = new URLSearchParams(window.location.search); - as.forEach(function(a){ + var as = Array.from(document.getElementsByClassName("merge_params")); + for (let a of as) + { var a_params = new URLSearchParams(a.search); var new_params = new URLSearchParams(); page_params.forEach(function(value, key) {new_params.set(key, value); }); a_params.forEach(function(value, key) {new_params.set(key, value); }); a.search = new_params.toString(); a.classList.remove("merge_params"); - }); + } } common.init_button_with_confirm = @@ -205,7 +206,7 @@ function init_button_with_confirm() data-holder-class: CSS class for the new span that holds the menu. */ var buttons = Array.from(document.getElementsByClassName("button_with_confirm")); - buttons.forEach(function(button) + for (let button of buttons) { button.classList.remove("button_with_confirm"); @@ -301,7 +302,7 @@ function init_button_with_confirm() holder.getElementsByClassName("confirm_holder_stage2")[0].classList.add("hidden"); } delete button.dataset.onclick; - }); + } } common.init_enable_on_pageload = @@ -313,11 +314,11 @@ function init_enable_on_pageload() class "enable_on_pageload". */ var elements = Array.from(document.getElementsByClassName("enable_on_pageload")); - elements.forEach(function(element) + for (let element of elements) { element.disabled = false; element.classList.remove("enable_on_pageload"); - }); + } } common.init_tabbed_container = @@ -356,13 +357,13 @@ function init_tabbed_container() } var tabbed_containers = Array.from(document.getElementsByClassName("tabbed_container")); - tabbed_containers.forEach(function(tabbed_container) + for (let tabbed_container of tabbed_containers) { var button_container = document.createElement("div"); button_container.className = "tab_buttons"; tabbed_container.prepend(button_container); var tabs = Array.from(tabbed_container.getElementsByClassName("tab")); - tabs.forEach(function(tab) + for (let tab of tabs) { tab.classList.add("hidden"); var tab_id = tab.dataset.tabId || tab.dataset.tabTitle; @@ -375,11 +376,11 @@ function init_tabbed_container() button.innerText = tab.dataset.tabTitle; button.dataset.tabId = tab_id; button_container.append(button); - }); + } tabs[0].classList.remove("hidden"); button_container.firstElementChild.classList.remove("tab_button_inactive"); button_container.firstElementChild.classList.add("tab_button_active"); - }); + } } common.refresh = diff --git a/frontends/etiquette_flask/static/js/spinner.js b/frontends/etiquette_flask/static/js/spinner.js index a1b6d42..ada2cad 100644 --- a/frontends/etiquette_flask/static/js/spinner.js +++ b/frontends/etiquette_flask/static/js/spinner.js @@ -54,10 +54,10 @@ function close_grouped_spinners(group_id) if (group_id && !(spinner.spinner_group_closing[group_id])) { spinner.spinner_group_closing[group_id] = true; - spinner.button_spinner_groups[group_id].forEach(function(button) + for (let button of spinner.button_spinner_groups[group_id]) { window[button.dataset.spinnerCloser](); - }); + } delete spinner.spinner_group_closing[group_id]; } } @@ -65,10 +65,10 @@ function close_grouped_spinners(group_id) spinner.open_grouped_spinners = function open_grouped_spinners(group_id) { - spinner.button_spinner_groups[group_id].forEach(function(button) + for (let button of spinner.button_spinner_groups[group_id]) { window[button.dataset.spinnerOpener](); - }); + } } spinner.init_button_with_spinner = @@ -99,7 +99,7 @@ function init_button_with_spinner() to run at a time. */ var buttons = Array.from(document.getElementsByClassName("button_with_spinner")); - buttons.forEach(function(button) + for (const button of buttons) { button.classList.remove("button_with_spinner"); button.innerHTML = button.innerHTML.trim(); @@ -165,7 +165,7 @@ function init_button_with_spinner() } spinner.spinner_button_index += 1; - }); + } } spinner.on_pageload = diff --git a/frontends/etiquette_flask/templates/clipboard.html b/frontends/etiquette_flask/templates/clipboard.html index 541604b..d4ec0dd 100644 --- a/frontends/etiquette_flask/templates/clipboard.html +++ b/frontends/etiquette_flask/templates/clipboard.html @@ -165,13 +165,13 @@ function recalculate_needed() divs is in `request_more_divs`. */ needed = new Set(); - photo_clipboard.clipboard.forEach(function(photo_id) + for (let photo_id of photo_clipboard.clipboard) { if (!(photo_id in divs)) { needed.add(photo_id); } - }); + } } function refresh_divs()