From ccf28ed055f08d38d28b19025d10cb4e7424464b Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Tue, 19 Jan 2021 20:52:57 -0500 Subject: Menu refactor (#1277) * Rename menuOpened event to menuOpen * Rename menuClosed event to menuClose * Rename close event * Assign _isClosed * Reuse event detail * Expose PopupMenu.openMenus * Rename and expose properties * Add cancelable argument to close * Update menuOpen detail * Update menuClose detail --- .../settings2/translation-text-replacements-controller.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'ext/bg/js/settings2/translation-text-replacements-controller.js') diff --git a/ext/bg/js/settings2/translation-text-replacements-controller.js b/ext/bg/js/settings2/translation-text-replacements-controller.js index 41ee8e3f..864b279e 100644 --- a/ext/bg/js/settings2/translation-text-replacements-controller.js +++ b/ext/bg/js/settings2/translation-text-replacements-controller.js @@ -158,8 +158,8 @@ class TranslationTextReplacementsEntry { replacementInput.dataset.setting = `${pathBase}.replacement`; ignoreCaseToggle.dataset.setting = `${pathBase}.ignoreCase`; - this._eventListeners.addEventListener(menuButton, 'menuOpened', this._onMenuOpened.bind(this), false); - this._eventListeners.addEventListener(menuButton, 'menuClosed', this._onMenuClosed.bind(this), false); + this._eventListeners.addEventListener(menuButton, 'menuOpen', this._onMenuOpen.bind(this), false); + this._eventListeners.addEventListener(menuButton, 'menuClose', this._onMenuClose.bind(this), false); this._eventListeners.addEventListener(patternInput, 'settingChanged', this._onPatternChanged.bind(this), false); this._eventListeners.addEventListener(ignoreCaseToggle, 'settingChanged', this._updateTestInput.bind(this), false); this._eventListeners.addEventListener(replacementInput, 'settingChanged', this._updateTestInput.bind(this), false); @@ -175,14 +175,15 @@ class TranslationTextReplacementsEntry { // Private - _onMenuOpened({detail: {menu}}) { + _onMenuOpen(e) { + const node = e.detail.menu.node; const testVisible = this._isTestVisible(); - menu.querySelector('[data-menu-action=showTest]').hidden = testVisible; - menu.querySelector('[data-menu-action=hideTest]').hidden = !testVisible; + node.querySelector('[data-menu-action=showTest]').hidden = testVisible; + node.querySelector('[data-menu-action=hideTest]').hidden = !testVisible; } - _onMenuClosed({detail: {action}}) { - switch (action) { + _onMenuClose(e) { + switch (e.detail.action) { case 'remove': this._parent.deleteGroup(this._index); break; -- cgit v1.2.3