aboutsummaryrefslogtreecommitdiff
path: root/ext/js
diff options
context:
space:
mode:
Diffstat (limited to 'ext/js')
-rw-r--r--ext/js/background/backend.js31
-rw-r--r--ext/js/data/options-util.js10
-rw-r--r--ext/js/pages/action-popup-main.js2
-rw-r--r--ext/js/pages/settings/modal-jquery.js73
4 files changed, 20 insertions, 96 deletions
diff --git a/ext/js/background/backend.js b/ext/js/background/backend.js
index a2a93375..ff119cf2 100644
--- a/ext/js/background/backend.js
+++ b/ext/js/background/backend.js
@@ -1945,31 +1945,20 @@ class Backend {
}
async _openSettingsPage(mode) {
- const {useSettingsV2} = this._options.global;
const manifest = chrome.runtime.getManifest();
- const url = chrome.runtime.getURL(useSettingsV2 ? manifest.options_ui.page : '/settings-old.html');
+ const url = chrome.runtime.getURL(manifest.options_ui.page);
switch (mode) {
case 'existingOrNewTab':
- if (!useSettingsV2) {
- const predicate = ({url: url2}) => (url2 !== null && url2.startsWith(url));
- const tab = await this._findTabs(1000, false, predicate, false);
- if (tab !== null) {
- await this._focusTab(tab);
- } else {
- await this._createTab(url);
- }
- } else {
- await new Promise((resolve, reject) => {
- chrome.runtime.openOptionsPage(() => {
- const e = chrome.runtime.lastError;
- if (e) {
- reject(new Error(e.message));
- } else {
- resolve();
- }
- });
+ await new Promise((resolve, reject) => {
+ chrome.runtime.openOptionsPage(() => {
+ const e = chrome.runtime.lastError;
+ if (e) {
+ reject(new Error(e.message));
+ } else {
+ resolve();
+ }
});
- }
+ });
break;
case 'newTab':
await this._createTab(url);
diff --git a/ext/js/data/options-util.js b/ext/js/data/options-util.js
index c31ae680..334445c6 100644
--- a/ext/js/data/options-util.js
+++ b/ext/js/data/options-util.js
@@ -458,7 +458,8 @@ class OptionsUtil {
{async: true, update: this._updateVersion6.bind(this)},
{async: false, update: this._updateVersion7.bind(this)},
{async: true, update: this._updateVersion8.bind(this)},
- {async: false, update: this._updateVersion9.bind(this)}
+ {async: false, update: this._updateVersion9.bind(this)},
+ {async: false, update: this._updateVersion10.bind(this)}
];
}
@@ -748,4 +749,11 @@ class OptionsUtil {
}
return options;
}
+
+ _updateVersion10(options) {
+ // Version 10 changes:
+ // Removed global option useSettingsV2.
+ delete options.global.useSettingsV2;
+ return options;
+ }
}
diff --git a/ext/js/pages/action-popup-main.js b/ext/js/pages/action-popup-main.js
index 75dfb641..e747e8a8 100644
--- a/ext/js/pages/action-popup-main.js
+++ b/ext/js/pages/action-popup-main.js
@@ -39,7 +39,7 @@ class DisplayController {
this._setupHotkeys();
- const optionsPageUrl = optionsFull.global.useSettingsV2 ? manifest.options_ui.page : '/settings-old.html';
+ const optionsPageUrl = manifest.options_ui.page;
this._setupButtonEvents('.action-open-settings', 'openSettingsPage', chrome.runtime.getURL(optionsPageUrl));
this._setupButtonEvents('.action-open-permissions', null, chrome.runtime.getURL('/permissions.html'));
diff --git a/ext/js/pages/settings/modal-jquery.js b/ext/js/pages/settings/modal-jquery.js
deleted file mode 100644
index 8c69ae6d..00000000
--- a/ext/js/pages/settings/modal-jquery.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (C) 2020-2021 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 <https://www.gnu.org/licenses/>.
- */
-
-class Modal extends EventDispatcher {
- constructor(node) {
- super();
- this._node = node;
- this._eventListeners = new EventListenerCollection();
- }
-
- get node() {
- return this._node;
- }
-
- prepare() {
- // NOP
- }
-
- isVisible() {
- return !!(this._getWrappedNode().data('bs.modal') || {}).isShown;
- }
-
- setVisible(value) {
- this._getWrappedNode().modal(value ? 'show' : 'hide');
- }
-
- on(eventName, callback) {
- if (eventName === 'visibilityChanged') {
- if (this._eventListeners.size === 0) {
- const wrappedNode = this._getWrappedNode();
- this._eventListeners.on(wrappedNode, 'hidden.bs.modal', this._onModalHide.bind(this));
- this._eventListeners.on(wrappedNode, 'shown.bs.modal', this._onModalShow.bind(this));
- }
- }
- return super.on(eventName, callback);
- }
-
- off(eventName, callback) {
- const result = super.off(eventName, callback);
- if (eventName === 'visibilityChanged' && !this.hasListeners(eventName)) {
- this._eventListeners.removeAllEventListeners();
- }
- return result;
- }
-
- // Private
-
- _onModalHide() {
- this.trigger('visibilityChanged', {visible: false});
- }
-
- _onModalShow() {
- this.trigger('visibilityChanged', {visible: true});
- }
-
- _getWrappedNode() {
- return $(this._node);
- }
-}