From d35d1fd44a20175aa8eff72f7e96234f4868bfd8 Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Sun, 18 Oct 2020 09:39:55 -0400 Subject: Generalize modal, move to popup-elements.js (#931) --- ext/bg/js/settings/modal.js | 110 --------------------------------- ext/bg/js/settings/popup-elements.js | 114 +++++++++++++++++++++++++++++++++++ 2 files changed, 114 insertions(+), 110 deletions(-) delete mode 100644 ext/bg/js/settings/modal.js create mode 100644 ext/bg/js/settings/popup-elements.js (limited to 'ext/bg/js') diff --git a/ext/bg/js/settings/modal.js b/ext/bg/js/settings/modal.js deleted file mode 100644 index dadab111..00000000 --- a/ext/bg/js/settings/modal.js +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Copyright (C) 2020 Yomichan Authors - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -class Modal extends EventDispatcher { - constructor(node) { - super(); - this._node = node; - this._mutationObserver = null; - this._visible = false; - this._visibleClassName = 'modal-container-open'; - this._openingClassName = 'modal-container-opening'; - this._closingClassName = 'modal-container-closing'; - this._closingAnimationDuration = 375; // Milliseconds; includes buffer - this._closeTimer = null; - } - - get node() { - return this._node; - } - - isVisible() { - return this._node.classList.contains(this._visibleClassName); - } - - setVisible(value, animate=true) { - value = !!value; - const {classList} = this._node; - if (classList.contains(this._visibleClassName) === value) { return; } - - if (this._closeTimer !== null) { - clearTimeout(this._closeTimer); - this._closeTimer = null; - } - - if (value) { - if (animate) { classList.add(this._openingClassName); } - classList.remove(this._closingClassName); - getComputedStyle(this._node).getPropertyValue('display'); // Force update of CSS display property, allowing animation - classList.add(this._visibleClassName); - if (animate) { classList.remove(this._openingClassName); } - this._node.focus(); - } else { - if (animate) { classList.add(this._closingClassName); } - classList.remove(this._visibleClassName); - if (animate) { - this._closeTimer = setTimeout(() => { - this._closeTimer = null; - classList.remove(this._closingClassName); - }, this._closingAnimationDuration); - } - } - } - - on(eventName, callback) { - if (eventName === 'visibilityChanged') { - if (this._mutationObserver === null) { - this._visible = this._node.classList.contains(this._visibleClassName); - this._mutationObserver = new MutationObserver(this._onMutation.bind(this)); - this._mutationObserver.observe(this._node, { - attributes: true, - attributeFilter: ['class'], - attributeOldValue: true - }); - } - } - return super.on(eventName, callback); - } - - off(eventName, callback) { - const result = super.off(eventName, callback); - if (eventName === 'visibilityChanged' && !this.hasListeners(eventName)) { - if (this._mutationObserver !== null) { - this._mutationObserver.disconnect(); - this._mutationObserver = null; - } - } - return result; - } - - // Private - - _onModalHide() { - this.trigger('visibilityChanged', {visible: false}); - } - - _onModalShow() { - this.trigger('visibilityChanged', {visible: true}); - } - - _onMutation() { - const visible = this._node.classList.contains(this._visibleClassName); - if (this._visible === visible) { return; } - this._visible = visible; - this.trigger('visibilityChanged', {visible}); - } -} diff --git a/ext/bg/js/settings/popup-elements.js b/ext/bg/js/settings/popup-elements.js new file mode 100644 index 00000000..1a35ddc9 --- /dev/null +++ b/ext/bg/js/settings/popup-elements.js @@ -0,0 +1,114 @@ +/* + * Copyright (C) 2020 Yomichan Authors + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +class PopupElement extends EventDispatcher { + constructor({node, visibleClassName, openingClassName, closingClassName, closingAnimationDuration}) { + super(); + this._node = node; + this._visibleClassName = visibleClassName; + this._openingClassName = openingClassName; + this._closingClassName = closingClassName; + this._closingAnimationDuration = closingAnimationDuration; + this._mutationObserver = null; + this._visible = false; + this._closeTimer = null; + } + + get node() { + return this._node; + } + + isVisible() { + return this._node.classList.contains(this._visibleClassName); + } + + setVisible(value, animate=true) { + value = !!value; + const {classList} = this._node; + if (classList.contains(this._visibleClassName) === value) { return; } + + if (this._closeTimer !== null) { + clearTimeout(this._closeTimer); + this._closeTimer = null; + } + + if (value) { + if (animate) { classList.add(this._openingClassName); } + classList.remove(this._closingClassName); + getComputedStyle(this._node).getPropertyValue('display'); // Force update of CSS display property, allowing animation + classList.add(this._visibleClassName); + if (animate) { classList.remove(this._openingClassName); } + this._node.focus(); + } else { + if (animate) { classList.add(this._closingClassName); } + classList.remove(this._visibleClassName); + if (animate) { + this._closeTimer = setTimeout(() => { + this._closeTimer = null; + classList.remove(this._closingClassName); + }, this._closingAnimationDuration); + } + } + } + + on(eventName, callback) { + if (eventName === 'visibilityChanged') { + if (this._mutationObserver === null) { + this._visible = this._node.classList.contains(this._visibleClassName); + this._mutationObserver = new MutationObserver(this._onMutation.bind(this)); + this._mutationObserver.observe(this._node, { + attributes: true, + attributeFilter: ['class'], + attributeOldValue: true + }); + } + } + return super.on(eventName, callback); + } + + off(eventName, callback) { + const result = super.off(eventName, callback); + if (eventName === 'visibilityChanged' && !this.hasListeners(eventName)) { + if (this._mutationObserver !== null) { + this._mutationObserver.disconnect(); + this._mutationObserver = null; + } + } + return result; + } + + // Private + + _onMutation() { + const visible = this._node.classList.contains(this._visibleClassName); + if (this._visible === visible) { return; } + this._visible = visible; + this.trigger('visibilityChanged', {visible}); + } +} + +class Modal extends EventDispatcher { + constructor(node) { + super({ + node, + visibleClassName: 'modal-container-open', + openingClassName: 'modal-container-opening', + closingClassName: 'modal-container-closing', + closingAnimationDuration: 375 // Milliseconds; includes buffer + }); + } +} -- cgit v1.2.3