Browse Source

Editor: Menubar code clean up.

Mr.doob 11 years ago
parent
commit
30307a98b4
4 changed files with 18 additions and 39 deletions
  1. 5 9
      editor/js/Menubar.Add.js
  2. 4 9
      editor/js/Menubar.Edit.js
  3. 5 12
      editor/js/Menubar.File.js
  4. 4 9
      editor/js/Menubar.Help.js

+ 5 - 9
editor/js/Menubar.Add.js

@@ -1,10 +1,5 @@
 Menubar.Add = function ( editor ) {
 Menubar.Add = function ( editor ) {
 
 
-	var menuConfig,
-		optionsPanel,
-		createOption,
-		createDivider;
-
 	var meshCount = 0;
 	var meshCount = 0;
 	var lightCount = 0;
 	var lightCount = 0;
 
 
@@ -243,10 +238,10 @@ Menubar.Add = function ( editor ) {
 
 
 	// configure menu contents
 	// configure menu contents
 
 
-	createOption  = UI.MenubarHelper.createOption;
-	createDivider = UI.MenubarHelper.createDivider;
+	var createOption = UI.MenubarHelper.createOption;
+	var createDivider = UI.MenubarHelper.createDivider;
 
 
-	menuConfig    = [
+	var menuConfig = [
 		createOption( 'Object3D', onObject3DOptionClick ),
 		createOption( 'Object3D', onObject3DOptionClick ),
 		createDivider(),
 		createDivider(),
 
 
@@ -270,7 +265,8 @@ Menubar.Add = function ( editor ) {
 		createOption( 'Ambient light', onAmbientLightOptionClick )
 		createOption( 'Ambient light', onAmbientLightOptionClick )
 	];
 	];
 
 
-	optionsPanel = UI.MenubarHelper.createOptionsPanel( menuConfig );
+	var optionsPanel = UI.MenubarHelper.createOptionsPanel( menuConfig );
 
 
 	return UI.MenubarHelper.createMenuContainer( 'Add', optionsPanel );
 	return UI.MenubarHelper.createMenuContainer( 'Add', optionsPanel );
+
 }
 }

+ 4 - 9
editor/js/Menubar.Edit.js

@@ -1,10 +1,5 @@
 Menubar.Edit = function ( editor ) {
 Menubar.Edit = function ( editor ) {
 
 
-	var menuConfig,
-		optionsPanel,
-		createOption,
-		createDivider;
-
 	// event handlers
 	// event handlers
 
 
 	// function onUndoOptionClick () {
 	// function onUndoOptionClick () {
@@ -84,10 +79,10 @@ Menubar.Edit = function ( editor ) {
 
 
 	// configure menu contents
 	// configure menu contents
 
 
-	createOption  = UI.MenubarHelper.createOption;
-	createDivider = UI.MenubarHelper.createDivider;
+	var createOption = UI.MenubarHelper.createOption;
+	var createDivider = UI.MenubarHelper.createDivider;
 
 
-	menuConfig    = [
+	var menuConfig = [
 		// createOption( 'Undo', onUndoOptionClick ),
 		// createOption( 'Undo', onUndoOptionClick ),
 		// createOption( 'Redo', onRedoOptionClick ),
 		// createOption( 'Redo', onRedoOptionClick ),
 		// createDivider(),
 		// createDivider(),
@@ -100,7 +95,7 @@ Menubar.Edit = function ( editor ) {
 		createOption( 'Flatten', onFlattenOptionClick )
 		createOption( 'Flatten', onFlattenOptionClick )
 	];
 	];
 
 
-	optionsPanel = UI.MenubarHelper.createOptionsPanel( menuConfig );
+	var optionsPanel = UI.MenubarHelper.createOptionsPanel( menuConfig );
 
 
 	return UI.MenubarHelper.createMenuContainer( 'Edit', optionsPanel );
 	return UI.MenubarHelper.createMenuContainer( 'Edit', optionsPanel );
 }
 }

+ 5 - 12
editor/js/Menubar.File.js

@@ -1,12 +1,5 @@
 Menubar.File = function ( editor ) {
 Menubar.File = function ( editor ) {
 
 
-	var menuConfig,
-		optionsPanel,
-		createOption,
-		createDivider,
-		fileInput;
-
-
 	// helpers
 	// helpers
 	
 	
 	function exportGeometry ( exporterClass ) {
 	function exportGeometry ( exporterClass ) {
@@ -160,16 +153,16 @@ Menubar.File = function ( editor ) {
 
 
 	// create file input element for scene import
 	// create file input element for scene import
 
 
-	fileInput = document.createElement( 'input' );
+	var fileInput = document.createElement( 'input' );
 	fileInput.type = 'file';
 	fileInput.type = 'file';
 	fileInput.addEventListener( 'change', onFileInputChange);
 	fileInput.addEventListener( 'change', onFileInputChange);
 
 
 	// configure menu contents
 	// configure menu contents
 
 
-	createOption  = UI.MenubarHelper.createOption;
-	createDivider = UI.MenubarHelper.createDivider;
+	var createOption = UI.MenubarHelper.createOption;
+	var createDivider = UI.MenubarHelper.createDivider;
 	
 	
-	menuConfig    = [
+	var menuConfig = [
 		createOption( 'New', onNewOptionClick ),
 		createOption( 'New', onNewOptionClick ),
 		createDivider(),
 		createDivider(),
 
 
@@ -182,7 +175,7 @@ Menubar.File = function ( editor ) {
 		createOption( 'Export OBJ', onExportOBJOptionClick )
 		createOption( 'Export OBJ', onExportOBJOptionClick )
 	];
 	];
 
 
-	optionsPanel = UI.MenubarHelper.createOptionsPanel( menuConfig );
+	var optionsPanel = UI.MenubarHelper.createOptionsPanel( menuConfig );
 
 
 	return UI.MenubarHelper.createMenuContainer( 'File', optionsPanel );
 	return UI.MenubarHelper.createMenuContainer( 'File', optionsPanel );
 
 

+ 4 - 9
editor/js/Menubar.Help.js

@@ -1,10 +1,5 @@
 Menubar.Help = function ( editor ) {
 Menubar.Help = function ( editor ) {
 
 
-	var menuConfig,
-		createOption,
-		createDivider,
-		optionsPanel;
-
 	// event handlers
 	// event handlers
 
 
 	function onSourcecodeOptionClick () {
 	function onSourcecodeOptionClick () {
@@ -21,15 +16,15 @@ Menubar.Help = function ( editor ) {
 
 
 	// configure menu contents
 	// configure menu contents
 
 
-	createOption  = UI.MenubarHelper.createOption;
-	createDivider = UI.MenubarHelper.createDivider;
+	var createOption = UI.MenubarHelper.createOption;
+	var createDivider = UI.MenubarHelper.createDivider;
 
 
-	menuConfig    = [
+	var menuConfig = [
 		createOption( 'Source code', onSourcecodeOptionClick ),
 		createOption( 'Source code', onSourcecodeOptionClick ),
 		createOption( 'About', onAboutOptionClick )
 		createOption( 'About', onAboutOptionClick )
 	];
 	];
 
 
-	optionsPanel = UI.MenubarHelper.createOptionsPanel( menuConfig );
+	var optionsPanel = UI.MenubarHelper.createOptionsPanel( menuConfig );
 
 
 	return UI.MenubarHelper.createMenuContainer( 'Help', optionsPanel );
 	return UI.MenubarHelper.createMenuContainer( 'Help', optionsPanel );
 }
 }