aboutsummaryrefslogtreecommitdiff
path: root/ext/js/app
diff options
context:
space:
mode:
Diffstat (limited to 'ext/js/app')
-rw-r--r--ext/js/app/frontend.js6
-rw-r--r--ext/js/app/popup-proxy.js14
-rw-r--r--ext/js/app/popup-window.js9
3 files changed, 12 insertions, 17 deletions
diff --git a/ext/js/app/frontend.js b/ext/js/app/frontend.js
index fec933f8..628c504e 100644
--- a/ext/js/app/frontend.js
+++ b/ext/js/app/frontend.js
@@ -21,10 +21,8 @@ import {EventListenerCollection, invokeMessageHandler, log, promiseAnimationFram
import {DocumentUtil} from '../dom/document-util.js';
import {TextSourceElement} from '../dom/text-source-element.js';
import {TextSourceRange} from '../dom/text-source-range.js';
-import {HotkeyHandler} from '../input/hotkey-handler.js';
import {TextScanner} from '../language/text-scanner.js';
import {yomitan} from '../yomitan.js';
-import {PopupFactory} from './popup-factory.js';
/**
* This is the main class responsible for scanning and handling webpage content.
@@ -50,7 +48,7 @@ export class Frontend {
}) {
/** @type {import('frontend').PageType} */
this._pageType = pageType;
- /** @type {PopupFactory} */
+ /** @type {import('./popup-factory.js').PopupFactory} */
this._popupFactory = popupFactory;
/** @type {number} */
this._depth = depth;
@@ -70,7 +68,7 @@ export class Frontend {
this._allowRootFramePopupProxy = allowRootFramePopupProxy;
/** @type {boolean} */
this._childrenSupported = childrenSupported;
- /** @type {HotkeyHandler} */
+ /** @type {import('../input/hotkey-handler.js').HotkeyHandler} */
this._hotkeyHandler = hotkeyHandler;
/** @type {?import('popup').PopupAny} */
this._popup = null;
diff --git a/ext/js/app/popup-proxy.js b/ext/js/app/popup-proxy.js
index 9b5b0214..924175e2 100644
--- a/ext/js/app/popup-proxy.js
+++ b/ext/js/app/popup-proxy.js
@@ -16,10 +16,8 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
-import {FrameOffsetForwarder} from '../comm/frame-offset-forwarder.js';
import {EventDispatcher, log} from '../core.js';
import {yomitan} from '../yomitan.js';
-import {Popup} from './popup.js';
/**
* This class is a proxy for a Popup that is hosted in a different frame.
@@ -44,7 +42,7 @@ export class PopupProxy extends EventDispatcher {
this._depth = depth;
/** @type {number} */
this._frameId = frameId;
- /** @type {?FrameOffsetForwarder} */
+ /** @type {?import('../comm/frame-offset-forwarder.js').FrameOffsetForwarder} */
this._frameOffsetForwarder = frameOffsetForwarder;
/** @type {number} */
@@ -70,7 +68,7 @@ export class PopupProxy extends EventDispatcher {
/**
* The parent of the popup, which is always `null` for `PopupProxy` instances,
* since any potential parent popups are in a different frame.
- * @type {?Popup}
+ * @type {?import('./popup.js').Popup}
*/
get parent() {
return null;
@@ -78,7 +76,7 @@ export class PopupProxy extends EventDispatcher {
/**
* Attempts to set the parent popup.
- * @param {Popup} _value The parent to assign.
+ * @param {import('./popup.js').Popup} _value The parent to assign.
* @throws {Error} Throws an error, since this class doesn't support a direct parent.
*/
set parent(_value) {
@@ -88,7 +86,7 @@ export class PopupProxy extends EventDispatcher {
/**
* The popup child popup, which is always null for `PopupProxy` instances,
* since any potential child popups are in a different frame.
- * @type {?Popup}
+ * @type {?import('./popup.js').Popup}
*/
get child() {
return null;
@@ -96,7 +94,7 @@ export class PopupProxy extends EventDispatcher {
/**
* Attempts to set the child popup.
- * @param {Popup} _child The child to assign.
+ * @param {import('./popup.js').Popup} _child The child to assign.
* @throws {Error} Throws an error, since this class doesn't support children.
*/
set child(_child) {
@@ -354,7 +352,7 @@ export class PopupProxy extends EventDispatcher {
* @param {number} now
*/
async _updateFrameOffsetInner(now) {
- this._frameOffsetPromise = /** @type {FrameOffsetForwarder} */ (this._frameOffsetForwarder).getOffset();
+ this._frameOffsetPromise = /** @type {import('../comm/frame-offset-forwarder.js').FrameOffsetForwarder} */ (this._frameOffsetForwarder).getOffset();
try {
const offset = await this._frameOffsetPromise;
if (offset !== null) {
diff --git a/ext/js/app/popup-window.js b/ext/js/app/popup-window.js
index af1ac1e4..9a0f8011 100644
--- a/ext/js/app/popup-window.js
+++ b/ext/js/app/popup-window.js
@@ -18,7 +18,6 @@
import {EventDispatcher} from '../core.js';
import {yomitan} from '../yomitan.js';
-import {Popup} from './popup.js';
/**
* This class represents a popup that is hosted in a new native window.
@@ -54,7 +53,7 @@ export class PopupWindow extends EventDispatcher {
}
/**
- * @type {?Popup}
+ * @type {?import('./popup.js').Popup}
*/
get parent() {
return null;
@@ -63,7 +62,7 @@ export class PopupWindow extends EventDispatcher {
/**
* The parent of the popup, which is always `null` for `PopupWindow` instances,
* since any potential parent popups are in a different frame.
- * @param {Popup} _value The parent to assign.
+ * @param {import('./popup.js').Popup} _value The parent to assign.
* @throws {Error} Throws an error, since this class doesn't support children.
*/
set parent(_value) {
@@ -73,7 +72,7 @@ export class PopupWindow extends EventDispatcher {
/**
* The popup child popup, which is always null for `PopupWindow` instances,
* since any potential child popups are in a different frame.
- * @type {?Popup}
+ * @type {?import('./popup.js').Popup}
*/
get child() {
return null;
@@ -81,7 +80,7 @@ export class PopupWindow extends EventDispatcher {
/**
* Attempts to set the child popup.
- * @param {Popup} _value The child to assign.
+ * @param {import('./popup.js').Popup} _value The child to assign.
* @throws Throws an error, since this class doesn't support children.
*/
set child(_value) {