Merge pull request #3773 from ewanhowell5195/fix-touchevent-crash

Author: JannisX11

js/interface/interface.js

@@ -323,7 +323,7 @@ export function setupInterface() {
 	])
 
 	document.oncontextmenu = function (event) {
-		if (!$(event.target).hasClass('allow_default_menu') && (!Blockbench.isTouch || event instanceof TouchEvent == false)) {
+		if (!$(event.target).hasClass('allow_default_menu') && (!Blockbench.isTouch || isTouchEvent(event) == false)) {
 			if (event.target.nodeName === 'INPUT' && $(event.target).is(':focus')) {
 				Interface.text_edit_menu.open(event, event.target)
 			}

js/modeling/mesh/knife_tool.js

@@ -745,7 +745,7 @@ BARS.defineActions(() => {
 		},
 		onCanvasClick(data) {
 			if (!data || !data.type) return;
-			if (data.event instanceof TouchEvent) {
+			if (isTouchEvent(data.event)) {
 				// Stop controls on mobile
 				PointerTarget.requestTarget(PointerTarget.types.gizmo_transform);
 				function onTouchEnd() {
@@ -767,7 +767,7 @@ BARS.defineActions(() => {
 						KnifeToolContext.current = new KnifeToolCubeContext(data.element);
 					}
 				}
-				if (data.event instanceof TouchEvent) return;
+				if (isTouchEvent(data.event)) return;
 			}
 			let context = KnifeToolContext.current;
 			if (context) {

js/modeling/transform/transform_gizmo.js

@@ -1479,7 +1479,7 @@ import { TransformerModule } from "./transform_modules";
 				}
 				_dragging = false;
 
-				if ( 'TouchEvent' in window && event instanceof TouchEvent ) {
+				if (isTouchEvent(event)) {
 					// Force "rollover"
 					scope.axis = null;
 					scope.update();

js/outliner/types/group.js

@@ -106,7 +106,7 @@ export class Group extends OutlinerNode {
 		}
 
 		//Select / Unselect Children
-		if (allSelected && (event.which === 1 || event instanceof TouchEvent)) {
+		if (allSelected && (event.which === 1 || isTouchEvent(event))) {
 			//Select Only Group, unselect Children
 			this.forEachChild(child => {
 				child.unselect();

js/preview/preview.ts

@@ -2,7 +2,7 @@ import { THREE } from '../lib/libs';
 import OrbitControls from './OrbitControls';
 import StateMemory from "../util/state_memory";
 import { ConfigDialog } from '../interface/dialog';
-import { getFaceKeyFromIndex, toSnakeCase } from '../util/util';
+import { getFaceKeyFromIndex, isTouchEvent, toSnakeCase } from '../util/util';
 import { electron, ipcRenderer } from '../native_apis';
 import { Pressing } from '../misc';
 import { CSS3DRenderer } from '../lib/CSS3DRenderer';
@@ -1612,7 +1612,7 @@ export class Preview {
 	mouseup(event: MouseEvent) {
 		this.showContextMenu(event);
 		if (settings.canvas_unselect.value &&
-			(event.which === 1 || event.which === 3 || event instanceof TouchEvent) &&
+			(event.which === 1 || event.which === 3 || isTouchEvent(event)) &&
 			!this.controls.hasMoved &&
 			!this.selection.activated &&
 			!Transformer.was_clicked &&
@@ -1622,7 +1622,7 @@ export class Preview {
 			unselectAllElements();
 		}
 		delete this.selection.click_target;
-		if (event instanceof TouchEvent) {
+		if (isTouchEvent(event)) {
 			Canvas.scene.remove(Canvas.brush_outline);
 		}
 		return this;
@@ -1685,7 +1685,7 @@ export class Preview {
 			Transformer.setCanvas(this.canvas);
 			Preview.selected.controls.update();
 		}
-		if (event instanceof TouchEvent) {
+		if (isTouchEvent(event)) {
 			Transformer.simulateMouseDown(event);
 		}
 		return this;

js/util/util.js

@@ -142,6 +142,11 @@ export function getFaceKeyFromIndex(element, index) {
 	}
 }
 
+// TouchEvent does not exist in some browsers if the device does not support touch
+export function isTouchEvent(event) {
+	return 'TouchEvent' in window && event instanceof TouchEvent;
+}
+
 export function convertTouchEvent(event) {
 	if (event && event.changedTouches && event.changedTouches.length && event.offsetX == undefined) {
 		//event.preventDefault();
@@ -780,6 +785,7 @@ Object.assign(window, {
 	Objector,
 	Merge,
 	pureMarked,
+	isTouchEvent,
 	convertTouchEvent,
 	addEventListeners,
 	removeEventListeners,