rename isTablet to supportTouch

src/editor/blocks/BlockArg.js

@@ -3,7 +3,7 @@ import BlockSpecs from './BlockSpecs';
 import Menu from './Menu';
 import Undo from '../ui/Undo';
 import {setCanvasSize, setProps, writeText, scaleMultiplier,
-    newHTML, newDiv, newCanvas, getStringSize, isTablet,
+    newHTML, newDiv, newCanvas, getStringSize,
     newP, globalx, globaly} from '../../utils/lib';
 import Localization from '../../utils/Localization';
 
@@ -295,7 +295,7 @@ export default class BlockArg {
     }
 
     pressDropDown (e, fcn) {
-        if (isTablet && e.touches && (e.touches.length > 1)) {
+        if (e.touches && (e.touches.length > 1)) {
             return;
         }
         if (ScratchJr.onHold) {

src/editor/blocks/Menu.js

@@ -1,5 +1,5 @@
 import BlockSpecs from './BlockSpecs';
-import {scaleMultiplier, setProps, setCanvasSize, newHTML, isTablet,
+import {scaleMultiplier, setProps, setCanvasSize, newHTML,
     newDiv, getDocumentHeight, drawThumbnail, frame, globalx, globaly} from '../../utils/lib';
 
 let openMenu = undefined;
@@ -82,7 +82,7 @@ export default class Menu {
             fcn(evt, mu, block, c);
         };
         function handleTouchStart (e) {
-            if (isTablet && e.touches && (e.touches.length > 1)) {
+            if (e.touches && (e.touches.length > 1)) {
                 return;
             }
             e.preventDefault();

src/editor/engine/Sprite.js

@@ -26,7 +26,7 @@ import ScratchAudio from '../../utils/ScratchAudio';
 import Scripts from '../ui/Scripts';
 import {newHTML, newDiv, newP, gn,
     setCanvasSizeScaledToWindowDocumentHeight,
-    DEGTOR, getIdFor, setProps, isTablet, isiOS,
+    DEGTOR, getIdFor, setProps, isiOS,
     isAndroid, fitInRect, scaleMultiplier, setCanvasSize,
     globaly, globalx, rgbToHex} from '../../utils/lib';
 
@@ -911,13 +911,9 @@ export default class Sprite {
                 me.unfocusText();
             });
         } else {
-            if (isTablet) {
+            setTimeout(function () {
                 ti.focus();
-            } else {
-                setTimeout(function () {
-                    ti.focus();
-                }, 100);
-            }
+            }, 100);
         }
     }
 

src/editor/ui/Grid.js

@@ -5,7 +5,7 @@
 import ScratchJr from '../ScratchJr';
 import Events from '../../utils/Events';
 import Localization from '../../utils/Localization';
-import {gn, scaleMultiplier, isTablet, newDiv, setProps, newP, newCanvas} from '../../utils/lib';
+import {gn, scaleMultiplier, newDiv, setProps, newP, newCanvas} from '../../utils/lib';
 
 let width = 482;
 let height = 362;
@@ -69,15 +69,12 @@ export default class Grid {
             ctx.stroke();
             dy += size;
         }
-        if (isTablet) {
-            cnv.ontouchstart = function (evt) {
-                ScratchJr.stage.mouseDown(evt);
-            };
-        } else {
-            cnv.onmousedown = function (evt) {
-                ScratchJr.stage.mouseDown(evt);
-            };
-        }
+        cnv.ontouchstart = function (evt) {
+            ScratchJr.stage.mouseDown(evt);
+        };
+        cnv.onmousedown = function (evt) {
+            ScratchJr.stage.mouseDown(evt);
+        };
     }
 
     static createNumbering (w, h) {
@@ -153,27 +150,21 @@ export default class Grid {
         var cnv = newCanvas(gc, 0, 0, size + 2, size + 2, {
             position: 'absolute'
         });
-        if (isTablet) {
-            cnv.ontouchstart = function (evt) {
-                Grid.mouseDownOnCursor(evt);
-            };
-        } else {
-            cnv.onmousedown = function (evt) {
-                Grid.mouseDownOnCursor(evt);
-            };
-        }
+        cnv.ontouchstart = function (evt) {
+            Grid.mouseDownOnCursor(evt);
+        };
+        cnv.onmousedown = function (evt) {
+            Grid.mouseDownOnCursor(evt);
+        };
         var ctx = cnv.getContext('2d');
         ctx.globalAlpha = 0.5;
         ctx.fillStyle = '#28A5DA';
         ctx.strokeStyle = '#656e73';
         ctx.lineWidth = 3;
         ctx.strokeRect(3, 3, size - 6, size - 6);
         ctx.fillRect(3, 3, size - 6, size - 6);
-        if (isTablet) {
-            gc.ontouchstart = Grid.mouseDownOnCursor;
-        } else {
-            gc.onmousedown = Grid.mouseDownOnCursor;
-        }
+        gc.ontouchstart = Grid.mouseDownOnCursor;
+        gc.onmousedown = Grid.mouseDownOnCursor;
     }
 
     static mouseDownOnCursor (e) {

src/editor/ui/Palette.js

@@ -14,7 +14,7 @@ import Rectangle from '../../geom/Rectangle';
 import DrawPath from '../../utils/DrawPath';
 import ScratchAudio from '../../utils/ScratchAudio';
 import Record from './Record';
-import {frame, gn, localx, newHTML, scaleMultiplier, isTablet, newDiv,
+import {frame, gn, localx, newHTML, scaleMultiplier, newDiv,
     setProps, globalx, localy, globaly, drawScaled, newCanvas,
     setCanvasSize, hitRect, writeText, getStringSize} from '../../utils/lib';
 
@@ -71,7 +71,7 @@ export default class Palette {
     }
 
     static paletteMouseDown (e) {
-        if (isTablet && e.touches && (e.touches.length > 1)) {
+        if (e.touches && (e.touches.length > 1)) {
             return;
         }
         if (ScratchJr.onHold) {

src/editor/ui/Scripts.js

@@ -9,7 +9,7 @@ import ScriptsPane from './ScriptsPane';
 import Events from '../../utils/Events';
 import ScratchAudio from '../../utils/ScratchAudio';
 import {gn, newHTML, setCanvasSize, setProps,
-    localx, localy, scaleMultiplier, hit3DRect, isTablet} from '../../utils/lib';
+    localx, localy, scaleMultiplier, hit3DRect} from '../../utils/lib';
 
 export default class Scripts {
     constructor (spr) {
@@ -43,7 +43,7 @@ export default class Scripts {
     ////////////////////////////////////////////////
 
     scriptsMouseDown (e) {
-        if (isTablet && e.touches && (e.touches.length > 1)) {
+        if (e.touches && (e.touches.length > 1)) {
             return;
         }
         if (ScratchJr.onHold) {

src/editor/ui/ScriptsPane.js

@@ -8,7 +8,7 @@ import Events from '../../utils/Events';
 import Scroll from './Scroll';
 import Menu from '../blocks/Menu';
 import ScratchAudio from '../../utils/ScratchAudio';
-import {gn, localx, localy, newHTML, isTablet,
+import {gn, localx, localy, newHTML,
     globalx, globaly, setCanvasSize, getDocumentHeight, frame} from '../../utils/lib';
 
 let scroll = undefined;
@@ -254,7 +254,7 @@ export default class ScriptsPane {
         if (Menu.openMenu) {
             return;
         }
-        if (isTablet && e.touches && (e.touches.length > 1)) {
+        if (e.touches && (e.touches.length > 1)) {
             return;
         }
         e.preventDefault();
@@ -270,21 +270,18 @@ export default class ScriptsPane {
     }
 
     static setDragBackgroundEvents (fcnmove, fcnup) {
-        if (isTablet) { // setDragBackgroundEvents
-            window.ontouchmove = function (evt) {
-                fcnmove(evt);
-            };
-            window.ontouchend = function (evt) {
-                fcnup(evt);
-            };
-        } else {
-            window.onmousemove = function (evt) {
-                fcnmove(evt);
-            };
-            window.onmouseup = function (evt) {
-                fcnup(evt);
-            };
-        }
+        window.ontouchmove = function (evt) {
+            fcnmove(evt);
+        };
+        window.ontouchend = function (evt) {
+            fcnup(evt);
+        };
+        window.onmousemove = function (evt) {
+            fcnmove(evt);
+        };
+        window.onmouseup = function (evt) {
+            fcnup(evt);
+        };
     }
 
     static dragMove (e) {

src/editor/ui/Scroll.js

@@ -3,7 +3,7 @@
 ////////////////////////////////////////////////
 
 import Events from '../../utils/Events';
-import {newDiv, newHTML, CSSTransition3D, isTablet, setCanvasSize} from '../../utils/lib';
+import {newDiv, newHTML, CSSTransition3D, setCanvasSize} from '../../utils/lib';
 
 export default class Scroll {
     constructor (div, id, w, h, cfcn, ofcn) {
@@ -50,45 +50,33 @@ export default class Scroll {
         newHTML('div', 'halign down', this.adown);
 
         var me = this;
-        if (isTablet) {
-            this.aup.ontouchstart = function (e) {
-                me.scrolldown(e);
-            };
-        } else {
-            this.aup.onmousedown = function (e) {
-                me.scrolldown(e);
-            };
-        }
+        this.aup.ontouchstart = function (e) {
+            me.scrolldown(e);
+        };
+        this.aup.onmousedown = function (e) {
+            me.scrolldown(e);
+        };
 
-        if (isTablet) {
-            this.adown.ontouchstart = function (e) {
-                me.scrollup(e);
-            };
-        } else {
-            this.adown.onmousedown = function (e) {
-                me.scrollup(e);
-            };
-        }
+        this.adown.ontouchstart = function (e) {
+            me.scrollup(e);
+        };
+        this.adown.onmousedown = function (e) {
+            me.scrollup(e);
+        };
 
-        if (isTablet) {
-            this.aleft.ontouchstart = function (e) {
-                me.scrollright(e);
-            };
-        } else {
-            this.aleft.onmousedown = function (e) {
-                me.scrollright(e);
-            };
-        }
+        this.aleft.ontouchstart = function (e) {
+            me.scrollright(e);
+        };
+        this.aleft.onmousedown = function (e) {
+            me.scrollright(e);
+        };
 
-        if (isTablet) {
-            this.aright.ontouchstart = function (e) {
-                me.scrollleft(e);
-            };
-        } else {
-            this.aright.onmousedown = function (e) {
-                me.scrollleft(e);
-            };
-        }
+        this.aright.ontouchstart = function (e) {
+            me.scrollleft(e);
+        };
+        this.aright.onmousedown = function (e) {
+            me.scrollleft(e);
+        };
 
     }
 
@@ -329,7 +317,7 @@ export default class Scroll {
     ////////////////////////////////////////////////////////////
 
     scrolldown (e) {
-        if (isTablet && e.touches && (e.touches.length > 1)) {
+        if (e.touches && (e.touches.length > 1)) {
             return;
         }
         e.preventDefault();
@@ -357,7 +345,7 @@ export default class Scroll {
     }
 
     scrollup (e) {
-        if (isTablet && e.touches && (e.touches.length > 1)) {
+        if (e.touches && (e.touches.length > 1)) {
             return;
         }
         e.preventDefault();
@@ -385,7 +373,7 @@ export default class Scroll {
     }
 
     scrollright (e) {
-        if (isTablet && e.touches && (e.touches.length > 1)) {
+        if (e.touches && (e.touches.length > 1)) {
             return;
         }
         e.preventDefault();
@@ -413,7 +401,7 @@ export default class Scroll {
     }
 
     scrollleft (e) {
-        if (isTablet && e.touches && (e.touches.length > 1)) {
+        if (e.touches && (e.touches.length > 1)) {
             return;
         }
         e.preventDefault();

src/editor/ui/Thumbs.js

@@ -12,7 +12,7 @@ import OS from '../../tablet/OS';
 import Events from '../../utils/Events';
 import ScratchAudio from '../../utils/ScratchAudio';
 import {frame, gn, localx, newHTML, scaleMultiplier, getIdFor,
-    isTablet, newImage, localy, setProps} from '../../utils/lib';
+    newImage, localy, setProps} from '../../utils/lib';
 
 let caret = undefined;
 
@@ -360,7 +360,7 @@ export default class Thumbs {
     }
 
     static clickOnEmptyPage (e) {
-        if (isTablet && e.touches && (e.touches.length > 1)) {
+        if (e.touches && (e.touches.length > 1)) {
             return;
         }
         ScratchAudio.sndFX('tap.wav');

src/editor/ui/UI.js

@@ -21,7 +21,7 @@ import Events from '../../utils/Events';
 import Localization from '../../utils/Localization';
 import ScratchAudio from '../../utils/ScratchAudio';
 import {frame, gn, CSSTransition, localx, newHTML, scaleMultiplier, fullscreenScaleMultiplier,
-    getIdFor, isTablet, newDiv, newTextInput, isAndroid, getDocumentWidth, getDocumentHeight,
+    getIdFor, newDiv, newTextInput, isAndroid, getDocumentWidth, getDocumentHeight,
     setProps, globalx} from '../../utils/lib';
 
 let projectNameTextInput = null;
@@ -598,7 +598,7 @@ export default class UI {
     //////////////////////////////////
 
     static spriteThumbsActions (e) {
-        if (isTablet && e.touches && (e.touches.length > 1)) {
+        if (e.touches && (e.touches.length > 1)) {
             return;
         }
         if (ScratchJr.onHold) {

src/editor/ui/Undo.js

@@ -8,7 +8,7 @@ import Project from './Project';
 import Palette from './Palette';
 import UI from './UI';
 import ScratchAudio from '../../utils/ScratchAudio';
-import {newHTML, isTablet, gn} from '../../utils/lib';
+import {newHTML, gn} from '../../utils/lib';
 
 let buffer = [];
 let index = 0;
@@ -72,7 +72,7 @@ export default class Undo {
     ////////////////////////////////
 
     static prevStep (e) {
-        if (isTablet && e.touches && (e.touches.length > 1)) {
+        if (e.touches && (e.touches.length > 1)) {
             return;
         }
         e.preventDefault();
@@ -93,7 +93,7 @@ export default class Undo {
     }
 
     static nextStep (e) {
-        if (isTablet && e.touches && (e.touches.length > 1)) {
+        if (e.touches && (e.touches.length > 1)) {
             return;
         }
         e.preventDefault();