alex/yomichan
1
Fork 0
Code Releases Activity

Merge pull request #126 from Garethp/patch-1

Browse Source 
Fixes for imposter element and range y position
This commit is contained in:
Alex Yatskov 2018-06-08 21:03:03 -07:00 committed by GitHub
commit 114f9a6ae9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ext/fg/js/document.js
View File

@ -55,6 +55,8 @@ function docImposterCreate(element) {
document.body.appendChild(imposter); document.body.appendChild(imposter);
imposter.scrollTop = element.scrollTop; imposter.scrollTop = element.scrollTop;
imposter.scrollLeft = element.scrollLeft; imposter.scrollLeft = element.scrollLeft;
return imposter;
} }
function docImposterDestroy() { function docImposterDestroy() {
@ -65,11 +67,12 @@ function docImposterDestroy() {
function docRangeFromPoint(point) { function docRangeFromPoint(point) {
const element = document.elementFromPoint(point.x, point.y); const element = document.elementFromPoint(point.x, point.y);
let imposter = null;
if (element) { if (element) {
if (element.nodeName === 'IMG' || element.nodeName === 'BUTTON') { if (element.nodeName === 'IMG' || element.nodeName === 'BUTTON') {
return new TextSourceElement(element); return new TextSourceElement(element);
} else if (element.nodeName === 'INPUT' || element.nodeName === 'TEXTAREA') { } else if (element.nodeName === 'INPUT' || element.nodeName === 'TEXTAREA') {
docImposterCreate(element); imposter = docImposterCreate(element);
} }
} }
@ -86,6 +89,14 @@ function docRangeFromPoint(point) {
} }
const range = document.caretRangeFromPoint(point.x, point.y); const range = document.caretRangeFromPoint(point.x, point.y);
if(imposter !== null) imposter.style.zIndex = -2147483646;
const rect = range.getClientRects()[0];
if (point.y > rect.bottom + 2) {
return;
}
if (range) { if (range) {
return new TextSourceRange(range); return new TextSourceRange(range);
} }