Merge remote-tracking branch 'alteredq/dev' into dev

editor/index.html

@@ -88,6 +88,11 @@
 			viewport.setHeight( '-webkit-calc(100% - 32px)', '-moz-calc(100% - 32px)', 'calc(100% - 32px)' );
 			document.body.appendChild( viewport.dom );
 
+			// set focus on Viewport to get hotkeys working
+			// right from the initial page load
+
+			viewport.dom.focus();
+
 			var menubar = new Menubar( signals );
 			menubar.setWidth( '100%' );
 			menubar.setHeight( '32px' );
@@ -99,20 +104,6 @@
 			sidebar.setHeight( '-webkit-calc(100% - 32px)', '-moz-calc(100% - 32px)', 'calc(100% - 32px)' );
 			document.body.appendChild( sidebar.dom );
 
-			document.addEventListener( 'keydown', function ( event ) {
-
-				switch ( event.keyCode ) {
-
-					case 46: // delete
-
-						signals.removeSelectedObject.dispatch();
-
-						break;
-
-				}
-
-			} );
-
 			document.addEventListener( 'drop', function ( event ) {
 
 				event.preventDefault();

editor/js/ui/Viewport.js

@@ -96,6 +96,8 @@ var Viewport = function ( signals ) {
 
 	var onMouseDown = function ( event ) {
 
+		container.dom.focus();
+
 		event.preventDefault();
 
 		if ( event.button === 0 ) {
@@ -208,6 +210,20 @@ var Viewport = function ( signals ) {
 
 	};
 
+	var onKeyDown = function ( event ) {
+
+		switch ( event.keyCode ) {
+
+			case 46: // delete
+
+				signals.removeSelectedObject.dispatch();
+
+				break;
+
+		}
+
+	};
+
 	container.dom.addEventListener( 'mousedown', onMouseDown, false );
 	container.dom.addEventListener( 'click', onClick, false );
 
@@ -482,6 +498,12 @@ var Viewport = function ( signals ) {
 
 	animate();
 
+	// set up for hotkeys
+	// must be done here, otherwise it doesn't work
+
+	container.dom.tabIndex = 1;
+	container.dom.addEventListener( 'keydown', onKeyDown, false );
+
 	//
 
 	function updateMaterials( root ) {