alex/yomichan
1
Fork 0
Code Releases Activity

Update frontend.js

Browse Source
This commit is contained in:
toasted-nutbread 2019-02-20 22:05:07 -05:00
parent dd52a1c01a
commit 0b8ae6c53a
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ext/fg/js/frontend.js
View File

@ -96,7 +96,7 @@ class Frontend {
const search = async () => { const search = async () => {
try { try {
await this.searchAt({x: e.clientX, y: e.clientY}, Frontend.SearchType.Mouse); await this.searchAt({x: e.clientX, y: e.clientY}, 'mouse');
} catch (e) { } catch (e) {
this.onError(e); this.onError(e);
} }
@ -203,7 +203,7 @@ class Frontend {
} }
const touch = touches[index]; const touch = touches[index];
this.searchFromTouch(touch.clientX, touch.clientY, Frontend.SearchType.TouchMove); this.searchFromTouch(touch.clientX, touch.clientY, 'touchMove');
e.preventDefault(); // Disable scroll e.preventDefault(); // Disable scroll
} }
@ -218,7 +218,7 @@ class Frontend {
} }
onAfterSearch(newRange, type, searched, success) { onAfterSearch(newRange, type, searched, success) {
if (type === Frontend.SearchType.Mouse) { if (type === 'mouse') {
return; return;
} }
@ -228,7 +228,7 @@ class Frontend {
return; return;
} }
if (type === Frontend.SearchType.TouchStart && newRange !== null) { if (type === 'touchStart' && newRange !== null) {
this.scrollPrevent = true; this.scrollPrevent = true;
} }
@ -377,7 +377,7 @@ class Frontend {
} }
getIndexOfTouch(touchList, identifier) { getIndexOfTouch(touchList, identifier) {
for (let i = 0, ii = touchList.length; i < ii; ++i) { for (let i in touchList) {
let t = touchList[i]; let t = touchList[i];
if (t.identifier === identifier) { if (t.identifier === identifier) {
return i; return i;
@ -388,8 +388,7 @@ class Frontend {
excludeTouches(touchList, excludeTouchList) { excludeTouches(touchList, excludeTouchList) {
const result = []; const result = [];
for (let i = 0, ii = touchList.length; i < ii; ++i) { for (let r of touchList) {
let r = result[i];
if (this.getIndexOfTouch(excludeTouchList, r.identifier) < 0) { if (this.getIndexOfTouch(excludeTouchList, r.identifier) < 0) {
result.push(r); result.push(r);
} }
@ -416,7 +415,7 @@ class Frontend {
this.setMouseDownPrevent(false, false); this.setMouseDownPrevent(false, false);
this.setClickPrevent(false); this.setClickPrevent(false);
this.searchFromTouch(touch.clientX, touch.clientY, Frontend.SearchType.TouchStart); this.searchFromTouch(touch.clientX, touch.clientY, 'touchStart');
} }
} }
@ -443,11 +442,9 @@ class Frontend {
return; return;
} }
const pos = {x: x, y: y};
const search = async () => { const search = async () => {
try { try {
await this.searchAt(pos, type); await this.searchAt({x, y}, type);
} catch (e) { } catch (e) {
this.onError(e); this.onError(e);
} }
@ -457,11 +454,5 @@ class Frontend {
} }
} }
Frontend.SearchType = {
Mouse: 0,
TouchStart: 1,
TouchMove: 2
};
window.yomichan_frontend = new Frontend(); window.yomichan_frontend = new Frontend();
window.yomichan_frontend.prepare(); window.yomichan_frontend.prepare();