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/document-focus-controller.js | 110 ------------------------------ 1 file changed, 110 deletions(-) delete mode 100644 ext/mixed/js/document-focus-controller.js (limited to 'ext/mixed/js/document-focus-controller.js') diff --git a/ext/mixed/js/document-focus-controller.js b/ext/mixed/js/document-focus-controller.js deleted file mode 100644 index 649b5abe..00000000 --- a/ext/mixed/js/document-focus-controller.js +++ /dev/null @@ -1,110 +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 . - */ - -/** - * This class is used to control the document focus when a non-body element contains the main scrollbar. - * Web browsers will not automatically focus a custom element with the scrollbar on load, which results in - * keyboard shortcuts (e.g. arrow keys) not controlling page scroll. Instead, this class will manually - * focus a dummy element inside the main content, which gives keyboard scroll focus to that element. - */ -class DocumentFocusController { - constructor() { - this._contentScrollFocusElement = document.querySelector('#content-scroll-focus'); - } - - prepare() { - window.addEventListener('focus', this._onWindowFocus.bind(this), false); - this._updateFocusedElement(false); - } - - blurElement(element) { - if (document.activeElement !== element) { return; } - element.blur(); - this._updateFocusedElement(false); - } - - // Private - - _onWindowFocus() { - this._updateFocusedElement(false); - } - - _updateFocusedElement(force) { - const target = this._contentScrollFocusElement; - if (target === null) { return; } - - const {activeElement} = document; - if ( - force || - activeElement === null || - activeElement === document.documentElement || - activeElement === document.body - ) { - // Get selection - const selection = window.getSelection(); - const selectionRanges1 = this._getSelectionRanges(selection); - - // Note: This function will cause any selected text to be deselected on Firefox. - target.focus({preventScroll: true}); - - // Restore selection - const selectionRanges2 = this._getSelectionRanges(selection); - if (!this._areRangesSame(selectionRanges1, selectionRanges2)) { - this._setSelectionRanges(selection, selectionRanges1); - } - } - } - - _getSelectionRanges(selection) { - const ranges = []; - for (let i = 0, ii = selection.rangeCount; i < ii; ++i) { - ranges.push(selection.getRangeAt(i)); - } - return ranges; - } - - _setSelectionRanges(selection, ranges) { - selection.removeAllRanges(); - for (const range of ranges) { - selection.addRange(range); - } - } - - _areRangesSame(ranges1, ranges2) { - const ii = ranges1.length; - if (ii !== ranges2.length) { - return false; - } - - for (let i = 0; i < ii; ++i) { - const range1 = ranges1[i]; - const range2 = ranges2[i]; - try { - if ( - range1.compareBoundaryPoints(Range.START_TO_START, range2) !== 0 || - range1.compareBoundaryPoints(Range.END_TO_END, range2) !== 0 - ) { - return false; - } - } catch (e) { - return false; - } - } - - return true; - } -} -- cgit v1.2.3