r4sas/tweb-i2p
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix ripple again

Browse Source
This commit is contained in:
morethanwords 2020-09-25 01:10:29 +03:00
parent 38867d6e56
commit cd418286b7
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/ripple.ts
View File

@ -56,6 +56,7 @@ export function ripple(elem: HTMLElement, callback: (id: number) => Promise<bool
} }
handler = null; handler = null;
touchStartFired = false;
}; };
//}); //});
@ -126,6 +127,7 @@ export function ripple(elem: HTMLElement, callback: (id: number) => Promise<bool
//}); //});
}; };
// TODO: rename this variable
let touchStartFired = false; let touchStartFired = false;
if(touchSupport) { if(touchSupport) {
let touchEnd = () => { let touchEnd = () => {
@ -134,7 +136,10 @@ export function ripple(elem: HTMLElement, callback: (id: number) => Promise<bool
elem.addEventListener('touchstart', (e) => { elem.addEventListener('touchstart', (e) => {
//console.log('ripple touchstart', e); //console.log('ripple touchstart', e);
if(e.touches.length > 1 || ((e.target as HTMLElement).tagName == 'BUTTON' && e.target != elem) || findUpClassName(e.target as HTMLElement, 'c-ripple') != r) { if(e.touches.length > 1
|| touchStartFired
|| ((e.target as HTMLElement).tagName == 'BUTTON' && e.target != elem)
|| findUpClassName(e.target as HTMLElement, 'c-ripple') != r) {
return; return;
} }
@ -149,7 +154,7 @@ export function ripple(elem: HTMLElement, callback: (id: number) => Promise<bool
e.cancelBubble = true; e.cancelBubble = true;
e.stopPropagation(); e.stopPropagation();
touchEnd(); touchEnd();
window.removeEventListener('touchend', touchEnd); elem.removeEventListener('touchend', touchEnd);
}, {once: true}); }, {once: true});
}, {passive: true}); }, {passive: true});
} else { } else {