scratchfoundation/scratchjr
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratchjr.git synced 2024-12-01 11:27:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #242 from LLK/fix-window-scroll-217

Browse source 
Change touchmove handling in editor to prevent scrolling whole window on iOS
This commit is contained in:
chrisgarrity 2020-03-23 15:28:34 -04:00 committed by GitHub
commit 09fbe4cfed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/editor/ScratchJr.js
View file

@ -226,9 +226,6 @@ export default class ScratchJr {
static editorEvents () { static editorEvents () {
document.ongesturestart = undefined; document.ongesturestart = undefined;
document.ontouchmove = function (e) {
e.preventDefault();
};
window.ontouchstart = ScratchJr.unfocus; window.ontouchstart = ScratchJr.unfocus;
if (isTablet) { if (isTablet) {
window.ontouchend = undefined; window.ontouchend = undefined;

1
src/editor/ui/Scripts.js
View file

@ -93,6 +93,7 @@ export default class Scripts {
// It seems to have been checking if the drag was on the invisible shadow of the repeat block // It seems to have been checking if the drag was on the invisible shadow of the repeat block
// It's not clear to me why we would want this, and seems functional without it. -- TM // It's not clear to me why we would want this, and seems functional without it. -- TM
//if ((ths.owner.blocktype == "repeat") && !hitTest(ths.childNodes[1], pixel)) continue; //if ((ths.owner.blocktype == "repeat") && !hitTest(ths.childNodes[1], pixel)) continue;
e.preventDefault();
Events.startDrag(e, ths, ScriptsPane.prepareToDrag, Events.startDrag(e, ths, ScriptsPane.prepareToDrag,
ScriptsPane.dropBlock, ScriptsPane.draggingBlock, ScriptsPane.runBlock); ScriptsPane.dropBlock, ScriptsPane.draggingBlock, ScriptsPane.runBlock);
return; return;