From 5de8fa09d189fc6ec9cd90a6373d9271cf1b2e93 Mon Sep 17 00:00:00 2001 From: Miodec Date: Fri, 11 Feb 2022 01:16:01 +0100 Subject: [PATCH] moved click handlers fixes 1 circular dependency part of #2462 --- frontend/src/js/pages/settings.js | 21 --------------------- frontend/src/js/popups/edit-preset-popup.js | 20 ++++++++++++++++++++ 2 files changed, 20 insertions(+), 21 deletions(-) diff --git a/frontend/src/js/pages/settings.js b/frontend/src/js/pages/settings.js index a86933168..6fc080939 100644 --- a/frontend/src/js/pages/settings.js +++ b/frontend/src/js/pages/settings.js @@ -10,7 +10,6 @@ import * as Funbox from "../test/funbox"; import * as TagController from "../controllers/tag-controller"; import * as PresetController from "../controllers/preset-controller"; import * as SimplePopups from "../popups/simple-popups"; -import * as EditPresetPopup from "../popups/edit-preset-popup"; import * as ThemePicker from "../settings/theme-picker"; import * as ImportExportSettingsPopup from "../popups/import-export-settings-popup"; import * as CustomThemePopup from "../popups/custom-theme-popup"; @@ -811,26 +810,6 @@ $(document).on( } ); -$(document).on( - "click", - ".pageSettings .section.presets .addPresetButton", - (e) => { - EditPresetPopup.show("add"); - } -); - -$(document).on("click", ".pageSettings .section.presets .editButton", (e) => { - let presetid = $(e.currentTarget).parent(".preset").attr("id"); - let name = $(e.currentTarget).siblings(".button").children(".title").text(); - EditPresetPopup.show("edit", presetid, name); -}); - -$(document).on("click", ".pageSettings .section.presets .removeButton", (e) => { - let presetid = $(e.currentTarget).parent(".preset").attr("id"); - let name = $(e.currentTarget).siblings(".button").children(".title").text(); - EditPresetPopup.show("remove", presetid, name); -}); - $(document).on( "click", ".pageSettings .section.presets .presetsList .preset .presetButton", diff --git a/frontend/src/js/popups/edit-preset-popup.js b/frontend/src/js/popups/edit-preset-popup.js index 4216a0e29..8463ad16d 100644 --- a/frontend/src/js/popups/edit-preset-popup.js +++ b/frontend/src/js/popups/edit-preset-popup.js @@ -180,3 +180,23 @@ $("#presetWrapper #presetEdit input").keypress((e) => { apply(); } }); + +$(document).on( + "click", + ".pageSettings .section.presets .addPresetButton", + (e) => { + show("add"); + } +); + +$(document).on("click", ".pageSettings .section.presets .editButton", (e) => { + let presetid = $(e.currentTarget).parent(".preset").attr("id"); + let name = $(e.currentTarget).siblings(".button").children(".title").text(); + show("edit", presetid, name); +}); + +$(document).on("click", ".pageSettings .section.presets .removeButton", (e) => { + let presetid = $(e.currentTarget).parent(".preset").attr("id"); + let name = $(e.currentTarget).siblings(".button").children(".title").text(); + show("remove", presetid, name); +});