diff --git a/dev/data/manifest-variants.json b/dev/data/manifest-variants.json
index 9b5793eb..b8f5c09d 100644
--- a/dev/data/manifest-variants.json
+++ b/dev/data/manifest-variants.json
@@ -49,7 +49,8 @@
"mixed/js/document-util.js",
"fg/js/dom-text-scanner.js",
"fg/js/popup.js",
- "fg/js/source.js",
+ "fg/js/text-source-range.js",
+ "fg/js/text-source-element.js",
"fg/js/popup-factory.js",
"fg/js/frame-offset-forwarder.js",
"fg/js/popup-proxy.js",
diff --git a/ext/bg/search.html b/ext/bg/search.html
index 8b787a18..b1fb7663 100644
--- a/ext/bg/search.html
+++ b/ext/bg/search.html
@@ -78,7 +78,8 @@
-
+
+
diff --git a/ext/bg/settings-popup-preview.html b/ext/bg/settings-popup-preview.html
index 59924a27..6487bd25 100644
--- a/ext/bg/settings-popup-preview.html
+++ b/ext/bg/settings-popup-preview.html
@@ -129,7 +129,8 @@
-
+
+
diff --git a/ext/fg/float.html b/ext/fg/float.html
index 2c15f0d2..df85bc62 100644
--- a/ext/fg/float.html
+++ b/ext/fg/float.html
@@ -53,7 +53,8 @@
-
+
+
diff --git a/ext/fg/js/text-source-element.js b/ext/fg/js/text-source-element.js
new file mode 100644
index 00000000..16ac5cd5
--- /dev/null
+++ b/ext/fg/js/text-source-element.js
@@ -0,0 +1,122 @@
+/*
+ * Copyright (C) 2016-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 TextSourceElement {
+ constructor(element, fullContent=null, startOffset=0, endOffset=0) {
+ this._element = element;
+ this._fullContent = (typeof fullContent === 'string' ? fullContent : TextSourceElement.getElementContent(element));
+ this._startOffset = startOffset;
+ this._endOffset = endOffset;
+ this._content = this._fullContent.substring(this._startOffset, this._endOffset);
+ }
+
+ get element() {
+ return this._element;
+ }
+
+ get fullContent() {
+ return this._fullContent;
+ }
+
+ get startOffset() {
+ return this._startOffset;
+ }
+
+ get endOffset() {
+ return this._endOffset;
+ }
+
+ clone() {
+ return new TextSourceElement(this._element, this._fullContent, this._startOffset, this._endOffset);
+ }
+
+ cleanup() {
+ // NOP
+ }
+
+ text() {
+ return this._content;
+ }
+
+ setEndOffset(length, fromEnd=false) {
+ if (fromEnd) {
+ const delta = Math.min(this._fullContent.length - this._endOffset, length);
+ this._endOffset += delta;
+ this._content = this._fullContent.substring(this._startOffset, this._endOffset);
+ return delta;
+ } else {
+ const delta = Math.min(this._fullContent.length - this._startOffset, length);
+ this._endOffset = this._startOffset + delta;
+ this._content = this._fullContent.substring(this._startOffset, this._endOffset);
+ return delta;
+ }
+ }
+
+ setStartOffset(length) {
+ const delta = Math.min(this._startOffset, length);
+ this._startOffset -= delta;
+ this._content = this._fullContent.substring(this._startOffset, this._endOffset);
+ return delta;
+ }
+
+ getRect() {
+ return this._element.getBoundingClientRect();
+ }
+
+ getWritingMode() {
+ return 'horizontal-tb';
+ }
+
+ select() {
+ // NOP
+ }
+
+ deselect() {
+ // NOP
+ }
+
+ equals(other) {
+ return (
+ typeof other === 'object' &&
+ other !== null &&
+ other instanceof TextSourceElement &&
+ this._element === other.element &&
+ this._fullContent === other.fullContent &&
+ this._startOffset === other.startOffset
+ );
+ }
+
+ static getElementContent(element) {
+ let content;
+ switch (element.nodeName.toUpperCase()) {
+ case 'BUTTON':
+ content = element.textContent;
+ break;
+ case 'IMG':
+ content = element.getAttribute('alt') || '';
+ break;
+ default:
+ content = `${element.value}`;
+ break;
+ }
+
+ // Remove zero-width non-joiner
+ content = content.replace(/\u200c/g, '');
+
+ return content;
+ }
+}
diff --git a/ext/fg/js/source.js b/ext/fg/js/text-source-range.js
similarity index 62%
rename from ext/fg/js/source.js
rename to ext/fg/js/text-source-range.js
index 70f14179..86a57ae1 100644
--- a/ext/fg/js/source.js
+++ b/ext/fg/js/text-source-range.js
@@ -19,10 +19,6 @@
* DOMTextScanner
*/
-/*
- * TextSourceRange
- */
-
class TextSourceRange {
constructor(range, content, imposterContainer, imposterSourceElement) {
this.range = range;
@@ -151,114 +147,3 @@ class TextSourceRange {
}
}
}
-
-
-/*
- * TextSourceElement
- */
-
-class TextSourceElement {
- constructor(element, fullContent=null, startOffset=0, endOffset=0) {
- this._element = element;
- this._fullContent = (typeof fullContent === 'string' ? fullContent : TextSourceElement.getElementContent(element));
- this._startOffset = startOffset;
- this._endOffset = endOffset;
- this._content = this._fullContent.substring(this._startOffset, this._endOffset);
- }
-
- get element() {
- return this._element;
- }
-
- get fullContent() {
- return this._fullContent;
- }
-
- get startOffset() {
- return this._startOffset;
- }
-
- get endOffset() {
- return this._endOffset;
- }
-
- clone() {
- return new TextSourceElement(this._element, this._fullContent, this._startOffset, this._endOffset);
- }
-
- cleanup() {
- // NOP
- }
-
- text() {
- return this._content;
- }
-
- setEndOffset(length, fromEnd=false) {
- if (fromEnd) {
- const delta = Math.min(this._fullContent.length - this._endOffset, length);
- this._endOffset += delta;
- this._content = this._fullContent.substring(this._startOffset, this._endOffset);
- return delta;
- } else {
- const delta = Math.min(this._fullContent.length - this._startOffset, length);
- this._endOffset = this._startOffset + delta;
- this._content = this._fullContent.substring(this._startOffset, this._endOffset);
- return delta;
- }
- }
-
- setStartOffset(length) {
- const delta = Math.min(this._startOffset, length);
- this._startOffset -= delta;
- this._content = this._fullContent.substring(this._startOffset, this._endOffset);
- return delta;
- }
-
- getRect() {
- return this._element.getBoundingClientRect();
- }
-
- getWritingMode() {
- return 'horizontal-tb';
- }
-
- select() {
- // NOP
- }
-
- deselect() {
- // NOP
- }
-
- equals(other) {
- return (
- typeof other === 'object' &&
- other !== null &&
- other instanceof TextSourceElement &&
- this._element === other.element &&
- this._fullContent === other.fullContent &&
- this._startOffset === other.startOffset
- );
- }
-
- static getElementContent(element) {
- let content;
- switch (element.nodeName.toUpperCase()) {
- case 'BUTTON':
- content = element.textContent;
- break;
- case 'IMG':
- content = element.getAttribute('alt') || '';
- break;
- default:
- content = `${element.value}`;
- break;
- }
-
- // Remove zero-width non-joiner
- content = content.replace(/\u200c/g, '');
-
- return content;
- }
-}
diff --git a/ext/manifest.json b/ext/manifest.json
index d267e62d..a4b2f89c 100644
--- a/ext/manifest.json
+++ b/ext/manifest.json
@@ -48,7 +48,8 @@
"mixed/js/document-util.js",
"fg/js/dom-text-scanner.js",
"fg/js/popup.js",
- "fg/js/source.js",
+ "fg/js/text-source-range.js",
+ "fg/js/text-source-element.js",
"fg/js/popup-factory.js",
"fg/js/frame-offset-forwarder.js",
"fg/js/popup-proxy.js",
diff --git a/test/test-document-util.js b/test/test-document-util.js
index 4489bdf1..99eea3ab 100644
--- a/test/test-document-util.js
+++ b/test/test-document-util.js
@@ -94,7 +94,8 @@ async function testDocument1() {
const vm = new VM({document, window, Range, Node});
vm.execute([
'fg/js/dom-text-scanner.js',
- 'fg/js/source.js',
+ 'fg/js/text-source-range.js',
+ 'fg/js/text-source-element.js',
'mixed/js/document-util.js'
]);
const [DOMTextScanner, TextSourceRange, TextSourceElement, DocumentUtil] = vm.get([