Browse Source

Editor: Clean up. (#23275)

linbingquan 3 years ago
parent
commit
c024700341

+ 3 - 3
editor/index.html

@@ -174,7 +174,7 @@
 				event.preventDefault();
 				event.dataTransfer.dropEffect = 'copy';
 
-			}, false );
+			});
 
 			document.addEventListener( 'drop', function ( event ) {
 
@@ -194,7 +194,7 @@
 
 				}
 
-			}, false );
+			} );
 
 			function onWindowResize() {
 
@@ -202,7 +202,7 @@
 
 			}
 
-			window.addEventListener( 'resize', onWindowResize, false );
+			window.addEventListener( 'resize', onWindowResize );
 
 			onWindowResize();
 

+ 16 - 16
editor/js/EditorControls.js

@@ -129,8 +129,8 @@ function EditorControls( object, domElement ) {
 
 		}
 
-		domElement.ownerDocument.addEventListener( 'pointermove', onPointerMove, false );
-		domElement.ownerDocument.addEventListener( 'pointerup', onPointerUp, false );
+		domElement.ownerDocument.addEventListener( 'pointermove', onPointerMove );
+		domElement.ownerDocument.addEventListener( 'pointerup', onPointerUp );
 
 	}
 
@@ -164,8 +164,8 @@ function EditorControls( object, domElement ) {
 
 		}
 
-		domElement.ownerDocument.removeEventListener( 'pointermove', onPointerMove, false );
-		domElement.ownerDocument.removeEventListener( 'pointerup', onPointerUp, false );
+		domElement.ownerDocument.removeEventListener( 'pointermove', onPointerMove );
+		domElement.ownerDocument.removeEventListener( 'pointerup', onPointerUp );
 
 	}
 
@@ -241,22 +241,22 @@ function EditorControls( object, domElement ) {
 
 	this.dispose = function () {
 
-		domElement.removeEventListener( 'contextmenu', contextmenu, false );
-		domElement.removeEventListener( 'dblclick', onMouseUp, false );
-		domElement.removeEventListener( 'wheel', onMouseWheel, false );
+		domElement.removeEventListener( 'contextmenu', contextmenu );
+		domElement.removeEventListener( 'dblclick', onMouseUp );
+		domElement.removeEventListener( 'wheel', onMouseWheel );
 
-		domElement.removeEventListener( 'pointerdown', onPointerDown, false );
+		domElement.removeEventListener( 'pointerdown', onPointerDown );
 
-		domElement.removeEventListener( 'touchstart', touchStart, false );
-		domElement.removeEventListener( 'touchmove', touchMove, false );
+		domElement.removeEventListener( 'touchstart', touchStart );
+		domElement.removeEventListener( 'touchmove', touchMove );
 
 	};
 
-	domElement.addEventListener( 'contextmenu', contextmenu, false );
-	domElement.addEventListener( 'dblclick', onMouseUp, false );
-	domElement.addEventListener( 'wheel', onMouseWheel, false );
+	domElement.addEventListener( 'contextmenu', contextmenu );
+	domElement.addEventListener( 'dblclick', onMouseUp );
+	domElement.addEventListener( 'wheel', onMouseWheel );
 
-	domElement.addEventListener( 'pointerdown', onPointerDown, false );
+	domElement.addEventListener( 'pointerdown', onPointerDown );
 
 	// touch
 
@@ -343,8 +343,8 @@ function EditorControls( object, domElement ) {
 
 	}
 
-	domElement.addEventListener( 'touchstart', touchStart, false );
-	domElement.addEventListener( 'touchmove', touchMove, false );
+	domElement.addEventListener( 'touchstart', touchStart );
+	domElement.addEventListener( 'touchmove', touchMove );
 
 }
 

+ 3 - 3
editor/js/Resizer.js

@@ -11,8 +11,8 @@ function Resizer( editor ) {
 
 		if ( event.isPrimary === false ) return;
 
-		dom.ownerDocument.addEventListener( 'pointermove', onPointerMove, false );
-		dom.ownerDocument.addEventListener( 'pointerup', onPointerUp, false );
+		dom.ownerDocument.addEventListener( 'pointermove', onPointerMove );
+		dom.ownerDocument.addEventListener( 'pointerup', onPointerUp );
 
 	}
 
@@ -49,7 +49,7 @@ function Resizer( editor ) {
 
 	}
 
-	dom.addEventListener( 'pointerdown', onPointerDown, false );
+	dom.addEventListener( 'pointerdown', onPointerDown );
 
 	return new UIElement( dom );
 

+ 1 - 1
editor/js/Sidebar.Scene.js

@@ -43,7 +43,7 @@ function SidebarScene( editor ) {
 				nodeStates.set( object, nodeStates.get( object ) === false ); // toggle
 				refreshUI();
 
-			}, false );
+			} );
 
 			option.insertBefore( opener, option.firstChild );
 

+ 1 - 1
editor/js/Sidebar.Settings.Shortcuts.js

@@ -166,7 +166,7 @@ function SidebarSettingsShortcuts( editor ) {
 
 		}
 
-	}, false );
+	} );
 
 	return container;
 

+ 7 - 7
editor/js/Viewport.js

@@ -232,7 +232,7 @@ function Viewport( editor ) {
 		var array = getMousePosition( container.dom, event.clientX, event.clientY );
 		onDownPosition.fromArray( array );
 
-		document.addEventListener( 'mouseup', onMouseUp, false );
+		document.addEventListener( 'mouseup', onMouseUp );
 
 	}
 
@@ -243,7 +243,7 @@ function Viewport( editor ) {
 
 		handleClick();
 
-		document.removeEventListener( 'mouseup', onMouseUp, false );
+		document.removeEventListener( 'mouseup', onMouseUp );
 
 	}
 
@@ -254,7 +254,7 @@ function Viewport( editor ) {
 		var array = getMousePosition( container.dom, touch.clientX, touch.clientY );
 		onDownPosition.fromArray( array );
 
-		document.addEventListener( 'touchend', onTouchEnd, false );
+		document.addEventListener( 'touchend', onTouchEnd );
 
 	}
 
@@ -267,7 +267,7 @@ function Viewport( editor ) {
 
 		handleClick();
 
-		document.removeEventListener( 'touchend', onTouchEnd, false );
+		document.removeEventListener( 'touchend', onTouchEnd );
 
 	}
 
@@ -288,9 +288,9 @@ function Viewport( editor ) {
 
 	}
 
-	container.dom.addEventListener( 'mousedown', onMouseDown, false );
-	container.dom.addEventListener( 'touchstart', onTouchStart, false );
-	container.dom.addEventListener( 'dblclick', onDoubleClick, false );
+	container.dom.addEventListener( 'mousedown', onMouseDown );
+	container.dom.addEventListener( 'touchstart', onTouchStart );
+	container.dom.addEventListener( 'dblclick', onDoubleClick );
 
 	// controls need to be added *after* main logic,
 	// otherwise controls.enabled doesn't work.

+ 27 - 27
editor/js/libs/ui.js

@@ -170,7 +170,7 @@ events.forEach( function ( event ) {
 
 	UIElement.prototype[ method ] = function ( callback ) {
 
-		this.dom.addEventListener( event.toLowerCase(), callback.bind( this ), false );
+		this.dom.addEventListener( event.toLowerCase(), callback.bind( this ) );
 
 		return this;
 
@@ -273,7 +273,7 @@ class UIInput extends UIElement {
 
 			event.stopPropagation();
 
-		}, false );
+		} );
 
 		this.setValue( text );
 
@@ -323,7 +323,7 @@ class UITextArea extends UIElement {
 
 			}
 
-		}, false );
+		} );
 
 	}
 
@@ -545,8 +545,8 @@ class UINumber extends UIElement {
 			prevPointer.x = event.clientX;
 			prevPointer.y = event.clientY;
 
-			document.addEventListener( 'mousemove', onMouseMove, false );
-			document.addEventListener( 'mouseup', onMouseUp, false );
+			document.addEventListener( 'mousemove', onMouseMove );
+			document.addEventListener( 'mouseup', onMouseUp );
 
 		}
 
@@ -576,8 +576,8 @@ class UINumber extends UIElement {
 
 		function onMouseUp() {
 
-			document.removeEventListener( 'mousemove', onMouseMove, false );
-			document.removeEventListener( 'mouseup', onMouseUp, false );
+			document.removeEventListener( 'mousemove', onMouseMove );
+			document.removeEventListener( 'mouseup', onMouseUp );
 
 			if ( Math.abs( distance ) < 2 ) {
 
@@ -599,8 +599,8 @@ class UINumber extends UIElement {
 				prevPointer.x = event.touches[ 0 ].pageX;
 				prevPointer.y = event.touches[ 0 ].pageY;
 
-				document.addEventListener( 'touchmove', onTouchMove, false );
-				document.addEventListener( 'touchend', onTouchEnd, false );
+				document.addEventListener( 'touchmove', onTouchMove );
+				document.addEventListener( 'touchend', onTouchEnd );
 
 			}
 
@@ -634,8 +634,8 @@ class UINumber extends UIElement {
 
 			if ( event.touches.length === 0 ) {
 
-				document.removeEventListener( 'touchmove', onTouchMove, false );
-				document.removeEventListener( 'touchend', onTouchEnd, false );
+				document.removeEventListener( 'touchmove', onTouchMove );
+				document.removeEventListener( 'touchend', onTouchEnd );
 
 			}
 
@@ -689,12 +689,12 @@ class UINumber extends UIElement {
 
 		onBlur();
 
-		this.dom.addEventListener( 'keydown', onKeyDown, false );
-		this.dom.addEventListener( 'mousedown', onMouseDown, false );
-		this.dom.addEventListener( 'touchstart', onTouchStart, false );
-		this.dom.addEventListener( 'change', onChange, false );
-		this.dom.addEventListener( 'focus', onFocus, false );
-		this.dom.addEventListener( 'blur', onBlur, false );
+		this.dom.addEventListener( 'keydown', onKeyDown );
+		this.dom.addEventListener( 'mousedown', onMouseDown );
+		this.dom.addEventListener( 'touchstart', onTouchStart );
+		this.dom.addEventListener( 'change', onChange );
+		this.dom.addEventListener( 'focus', onFocus );
+		this.dom.addEventListener( 'blur', onBlur );
 
 	}
 
@@ -811,8 +811,8 @@ class UIInteger extends UIElement {
 			prevPointer.x = event.clientX;
 			prevPointer.y = event.clientY;
 
-			document.addEventListener( 'mousemove', onMouseMove, false );
-			document.addEventListener( 'mouseup', onMouseUp, false );
+			document.addEventListener( 'mousemove', onMouseMove );
+			document.addEventListener( 'mouseup', onMouseUp );
 
 		}
 
@@ -842,8 +842,8 @@ class UIInteger extends UIElement {
 
 		function onMouseUp() {
 
-			document.removeEventListener( 'mousemove', onMouseMove, false );
-			document.removeEventListener( 'mouseup', onMouseUp, false );
+			document.removeEventListener( 'mousemove', onMouseMove );
+			document.removeEventListener( 'mouseup', onMouseUp );
 
 			if ( Math.abs( distance ) < 2 ) {
 
@@ -902,11 +902,11 @@ class UIInteger extends UIElement {
 
 		onBlur();
 
-		this.dom.addEventListener( 'keydown', onKeyDown, false );
-		this.dom.addEventListener( 'mousedown', onMouseDown, false );
-		this.dom.addEventListener( 'change', onChange, false );
-		this.dom.addEventListener( 'focus', onFocus, false );
-		this.dom.addEventListener( 'blur', onBlur, false );
+		this.dom.addEventListener( 'keydown', onKeyDown );
+		this.dom.addEventListener( 'mousedown', onMouseDown );
+		this.dom.addEventListener( 'change', onChange );
+		this.dom.addEventListener( 'focus', onFocus );
+		this.dom.addEventListener( 'blur', onBlur );
 
 	}
 
@@ -1273,7 +1273,7 @@ class ListboxItem extends UIDiv {
 
 		}
 
-		this.dom.addEventListener( 'click', onClick, false );
+		this.dom.addEventListener( 'click', onClick );
 
 	}
 

+ 4 - 4
editor/js/libs/ui.three.js

@@ -35,14 +35,14 @@ class UITexture extends UISpan {
 
 			input.click();
 
-		}, false );
+		} );
 		canvas.addEventListener( 'drop', function ( event ) {
 
 			event.preventDefault();
 			event.stopPropagation();
 			loadFile( event.dataTransfer.files[ 0 ] );
 
-		}, false );
+		} );
 		this.dom.appendChild( canvas );
 
 		function loadFile( file ) {
@@ -368,7 +368,7 @@ class UIOutliner extends UIDiv {
 
 			}
 
-		}, false );
+		} );
 
 		// Keybindings to support arrow navigation
 		this.dom.addEventListener( 'keyup', function ( event ) {
@@ -384,7 +384,7 @@ class UIOutliner extends UIDiv {
 
 			}
 
-		}, false );
+		} );
 
 		this.editor = editor;