alex/yomichan
1
Fork 0
Code Releases Activity

handle scanning text for janky websites better #23

Browse Source
This commit is contained in:
Alex Yatskov 2017-05-21 22:44:22 -07:00
parent 48f612bb92
commit 84f5954ad5
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ext/fg/js/source-range.js
View File

@ -84,8 +84,22 @@ class TextSourceRange {
} }
static shouldEnter(node) { static shouldEnter(node) {
if (node.nodeType !== 1) {
return false;
}
const skip = ['RT', 'SCRIPT', 'STYLE']; const skip = ['RT', 'SCRIPT', 'STYLE'];
return !skip.includes(node.nodeName); if (skip.includes(node.nodeName)) {
return false;
}
const style = window.getComputedStyle(node);
const hidden =
style.visibility === 'hidden' ||
style.display === 'none' ||
parseFloat(style.fontSize) === 0;
return !hidden;
} }
static seekForward(node, offset, length) { static seekForward(node, offset, length) {
@ -106,7 +120,7 @@ class TextSourceRange {
} }
static seekForwardHelper(node, state) { static seekForwardHelper(node, state) {
if (node.nodeType === 3) { if (node.nodeType === 3 && node.parentElement && TextSourceRange.shouldEnter(node.parentElement)) {
const offset = state.node === node ? state.offset : 0; const offset = state.node === node ? state.offset : 0;
const remaining = node.length - offset; const remaining = node.length - offset;
const consumed = Math.min(remaining, state.remainder); const consumed = Math.min(remaining, state.remainder);
@ -143,7 +157,7 @@ class TextSourceRange {
} }
static seekBackwardHelper(node, state) { static seekBackwardHelper(node, state) {
if (node.nodeType === 3) { if (node.nodeType === 3 && node.parentElement && TextSourceRange.shouldEnter(node.parentElement)) {
const offset = state.node === node ? state.offset : node.length; const offset = state.node === node ? state.offset : node.length;
const remaining = offset; const remaining = offset;
const consumed = Math.min(remaining, state.remainder); const consumed = Math.min(remaining, state.remainder);