From 6a271e067fa917614f4c81f473533e24c6d04404 Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Sat, 13 Feb 2021 22:52:28 -0500 Subject: Move mixed/js (#1383) * Move mixed/js/core.js to js/core.js * Move mixed/js/yomichan.js to js/yomichan.js * Move mixed/js/timer.js to js/debug/timer.js * Move mixed/js/hotkey-handler.js to js/input/hotkey-handler.js * Move mixed/js/hotkey-help-controller.js to js/input/hotkey-help-controller.js * Move mixed/js/hotkey-util.js to js/input/hotkey-util.js * Move mixed/js/audio-system.js to js/input/audio-system.js * Move mixed/js/media-loader.js to js/input/media-loader.js * Move mixed/js/text-to-speech-audio.js to js/input/text-to-speech-audio.js * Move mixed/js/comm.js to js/comm/cross-frame-api.js * Move mixed/js/api.js to js/comm/api.js * Move mixed/js/frame-client.js to js/comm/frame-client.js * Move mixed/js/frame-endpoint.js to js/comm/frame-endpoint.js * Move mixed/js/display.js to js/display/display.js * Move mixed/js/display-audio.js to js/display/display-audio.js * Move mixed/js/display-generator.js to js/display/display-generator.js * Move mixed/js/display-history.js to js/display/display-history.js * Move mixed/js/display-notification.js to js/display/display-notification.js * Move mixed/js/display-profile-selection.js to js/display/display-profile-selection.js * Move mixed/js/japanese.js to js/language/japanese-util.js * Move mixed/js/dictionary-data-util.js to js/language/dictionary-data-util.js * Move mixed/js/document-focus-controller.js to js/dom/document-focus-controller.js * Move mixed/js/document-util.js to js/dom/document-util.js * Move mixed/js/dom-data-binder.js to js/dom/dom-data-binder.js * Move mixed/js/html-template-collection.js to js/dom/html-template-collection.js * Move mixed/js/panel-element.js to js/dom/panel-element.js * Move mixed/js/popup-menu.js to js/dom/popup-menu.js * Move mixed/js/selector-observer.js to js/dom/selector-observer.js * Move mixed/js/scroll.js to js/dom/window-scroll.js * Move mixed/js/text-scanner.js to js/language/text-scanner.js * Move mixed/js/cache-map.js to js/general/cache-map.js * Move mixed/js/object-property-accessor.js to js/general/object-property-accessor.js * Move mixed/js/task-accumulator.js to js/general/task-accumulator.js * Move mixed/js/environment.js to js/background/environment.js * Move mixed/js/dynamic-loader.js to js/scripting/dynamic-loader.js * Move mixed/js/dynamic-loader-sentinel.js to js/scripting/dynamic-loader-sentinel.js --- ext/mixed/js/dynamic-loader.js | 170 ----------------------------------------- 1 file changed, 170 deletions(-) delete mode 100644 ext/mixed/js/dynamic-loader.js (limited to 'ext/mixed/js/dynamic-loader.js') diff --git a/ext/mixed/js/dynamic-loader.js b/ext/mixed/js/dynamic-loader.js deleted file mode 100644 index bb4efb13..00000000 --- a/ext/mixed/js/dynamic-loader.js +++ /dev/null @@ -1,170 +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 . - */ - -/* global - * api - */ - -const dynamicLoader = (() => { - const injectedStylesheets = new Map(); - const injectedStylesheetsWithParent = new WeakMap(); - - function getInjectedStylesheet(id, parentNode) { - if (parentNode === null) { - return injectedStylesheets.get(id); - } - const map = injectedStylesheetsWithParent.get(parentNode); - return typeof map !== 'undefined' ? map.get(id) : void 0; - } - - function setInjectedStylesheet(id, parentNode, value) { - if (parentNode === null) { - injectedStylesheets.set(id, value); - return; - } - let map = injectedStylesheetsWithParent.get(parentNode); - if (typeof map === 'undefined') { - map = new Map(); - injectedStylesheetsWithParent.set(parentNode, map); - } - map.set(id, value); - } - - async function loadStyle(id, type, value, useWebExtensionApi=false, parentNode=null) { - if (useWebExtensionApi && yomichan.isExtensionUrl(window.location.href)) { - // Permissions error will occur if trying to use the WebExtension API to inject into an extension page - useWebExtensionApi = false; - } - - let styleNode = getInjectedStylesheet(id, parentNode); - if (typeof styleNode !== 'undefined') { - if (styleNode === null) { - // Previously injected via WebExtension API - throw new Error(`Stylesheet with id ${id} has already been injected using the WebExtension API`); - } - } else { - styleNode = null; - } - - if (type === 'file-content') { - value = await api.getStylesheetContent(value); - type = 'code'; - useWebExtensionApi = false; - } - - if (useWebExtensionApi) { - // Inject via WebExtension API - if (styleNode !== null && styleNode.parentNode !== null) { - styleNode.parentNode.removeChild(styleNode); - } - - setInjectedStylesheet(id, parentNode, null); - await api.injectStylesheet(type, value); - return null; - } - - // Create node in document - let parentNode2 = parentNode; - if (parentNode2 === null) { - parentNode2 = document.head; - if (parentNode2 === null) { - throw new Error('No parent node'); - } - } - - // Create or reuse node - const isFile = (type === 'file'); - const tagName = isFile ? 'link' : 'style'; - if (styleNode === null || styleNode.nodeName.toLowerCase() !== tagName) { - if (styleNode !== null && styleNode.parentNode !== null) { - styleNode.parentNode.removeChild(styleNode); - } - styleNode = document.createElement(tagName); - } - - // Update node style - if (isFile) { - styleNode.rel = 'stylesheet'; - styleNode.href = value; - } else { - styleNode.textContent = value; - } - - // Update parent - if (styleNode.parentNode !== parentNode2) { - parentNode2.appendChild(styleNode); - } - - // Add to map - setInjectedStylesheet(id, parentNode, styleNode); - return styleNode; - } - - function loadScripts(urls) { - return new Promise((resolve, reject) => { - const parent = document.body; - if (parent === null) { - reject(new Error('Missing body')); - return; - } - - for (const url of urls) { - const node = parent.querySelector(`script[src='${escapeCSSAttribute(url)}']`); - if (node !== null) { continue; } - - const script = document.createElement('script'); - script.async = false; - script.src = url; - parent.appendChild(script); - } - - loadScriptSentinel(parent, resolve, reject); - }); - } - - function loadScriptSentinel(parent, resolve, reject) { - const script = document.createElement('script'); - - const sentinelEventName = 'dynamicLoaderSentinel'; - const sentinelEventCallback = (e) => { - if (e.script !== script) { return; } - yomichan.off(sentinelEventName, sentinelEventCallback); - parent.removeChild(script); - resolve(); - }; - yomichan.on(sentinelEventName, sentinelEventCallback); - - try { - script.async = false; - script.src = '/mixed/js/dynamic-loader-sentinel.js'; - parent.appendChild(script); - } catch (e) { - yomichan.off(sentinelEventName, sentinelEventCallback); - reject(e); - } - } - - function escapeCSSAttribute(value) { - return value.replace(/['\\]/g, (character) => `\\${character}`); - } - - - return { - loadStyle, - loadScripts - }; -})(); -- cgit v1.2.3