From 869883ec85ebe4bd105b73407241c4f8da637c90 Mon Sep 17 00:00:00 2001 From: dnahol Date: Sat, 2 Nov 2019 02:37:41 -0700 Subject: [PATCH] add Logic.getPanelElementByKey(key), refactor code in Logic.showPanel(panel) --- src/js/popup.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/js/popup.js b/src/js/popup.js index c47fc8d..c94238b 100644 --- a/src/js/popup.js +++ b/src/js/popup.js @@ -281,7 +281,7 @@ const Logic = { await this._panels[panel].prepare(); Object.keys(this._panels).forEach((panelKey) => { const panelItem = this._panels[panelKey]; - const panelElement = document.querySelector(this.getPanelSelector(panelItem)); + const panelElement = this.getPanelElementByKey(panelKey); if (!panelElement.classList.contains("hide")) { panelElement.classList.add("hide"); if ("unregister" in panelItem) { @@ -289,7 +289,7 @@ const Logic = { } } }); - const panelEl = document.querySelector(this.getPanelSelector(this._panels[panel])); + const panelEl = this.getCurrentPanelElement(); panelEl.classList.remove("hide"); const focusEl = panelEl.querySelector(".firstTabindex"); @@ -393,6 +393,11 @@ const Logic = { const panelItem = this._panels[this._currentPanel]; return document.querySelector(this.getPanelSelector(panelItem)); }, + + getPanelElementByKey(panelKey) { + const panelItem = this._panels[panelKey]; + return document.querySelector(this.getPanelSelector(panelItem)); + } }; // P_ONBOARDING_1: First page for Onboarding.