소스 검색

removes usage of with keyword du toe performance issues

http://jsperf.com/with-statement/4
Dennis Wilson 11 년 전
부모
커밋
53ea635772
5개의 변경된 파일78개의 추가작업 그리고 72개의 파일을 삭제
  1. 29 28
      editor/js/Menubar.Add.js
  2. 15 14
      editor/js/Menubar.Edit.js
  3. 16 15
      editor/js/Menubar.File.js
  4. 8 7
      editor/js/Menubar.Help.js
  5. 10 8
      editor/js/Menubar.View.js

+ 29 - 28
editor/js/Menubar.Add.js

@@ -1,7 +1,9 @@
 Menubar.Add = function ( editor ) {
 
 	var menuConfig,
-		optionsPanel;
+		optionsPanel,
+		createOption,
+		createDivider;
 
 	var meshCount = 0;
 	var lightCount = 0;
@@ -241,33 +243,32 @@ Menubar.Add = function ( editor ) {
 
 	// configure menu contents
 
-	with(UI.MenubarHelper) {
-
-		menuConfig   = [
-			createOption( 'Object3D', onObject3DOptionClick ),
-			createDivider(),
-
-			createOption( 'Plane', onPlaneOptionClick ),
-			createOption( 'Box', onBoxOptionClick ),
-			createOption( 'Circle', onCircleOptionClick ),
-			createOption( 'Cylinder', onCylinderOptionClick ),
-			createOption( 'Sphere', onSphereOptionClick  ),
-			createOption( 'Icosahedron', onIcosahedronOptionClick ),
-			createOption( 'Torus', onTorusOptionClick ),
-			createOption( 'Torus Knot', onTorusKnotOptionClick ),
-			createDivider(),
-
-			createOption( 'Sprite', onSpriteOptionClick  ),
-			createDivider(),
-
-			createOption( 'Point light', onPointLightOptionClick ),
-			createOption( 'Spot light', onSpotLightOptionClick ),
-			createOption( 'Directional light', onDirectionalLightOptionClick ),
-			createOption( 'Hemisphere light', onHemisphereLightOptionClick ),
-			createOption( 'Ambient light', onAmbientLightOptionClick )
-		];
-
-	}
+	createOption  = UI.MenubarHelper.createOption;
+	createDivider = UI.MenubarHelper.createDivider;
+
+	menuConfig    = [
+		createOption( 'Object3D', onObject3DOptionClick ),
+		createDivider(),
+
+		createOption( 'Plane', onPlaneOptionClick ),
+		createOption( 'Box', onBoxOptionClick ),
+		createOption( 'Circle', onCircleOptionClick ),
+		createOption( 'Cylinder', onCylinderOptionClick ),
+		createOption( 'Sphere', onSphereOptionClick  ),
+		createOption( 'Icosahedron', onIcosahedronOptionClick ),
+		createOption( 'Torus', onTorusOptionClick ),
+		createOption( 'Torus Knot', onTorusKnotOptionClick ),
+		createDivider(),
+
+		createOption( 'Sprite', onSpriteOptionClick  ),
+		createDivider(),
+
+		createOption( 'Point light', onPointLightOptionClick ),
+		createOption( 'Spot light', onSpotLightOptionClick ),
+		createOption( 'Directional light', onDirectionalLightOptionClick ),
+		createOption( 'Hemisphere light', onHemisphereLightOptionClick ),
+		createOption( 'Ambient light', onAmbientLightOptionClick )
+	];
 
 	optionsPanel = UI.MenubarHelper.createOptionsPanel( menuConfig );
 

+ 15 - 14
editor/js/Menubar.Edit.js

@@ -1,7 +1,9 @@
 Menubar.Edit = function ( editor ) {
 
 	var menuConfig,
-		optionsPanel;
+		optionsPanel,
+		createOption,
+		createDivider;
 
 	// event handlers
 
@@ -82,22 +84,21 @@ Menubar.Edit = function ( editor ) {
 
 	// configure menu contents
 
-	with(UI.MenubarHelper) {
+	createOption  = UI.MenubarHelper.createOption;
+	createDivider = UI.MenubarHelper.createDivider;
 
-		menuConfig   = [
-			// createOption( 'Undo', onUndoOptionClick ),
-			// createOption( 'Redo', onRedoOptionClick ),
-			// createDivider(),
+	menuConfig    = [
+		// createOption( 'Undo', onUndoOptionClick ),
+		// createOption( 'Redo', onRedoOptionClick ),
+		// createDivider(),
 
-			createOption( 'Clone', onCloneOptionClick ),
-			createOption( 'Delete', onDeleteOptionClick ),
-			createDivider(),
+		createOption( 'Clone', onCloneOptionClick ),
+		createOption( 'Delete', onDeleteOptionClick ),
+		createDivider(),
 
-			createOption( 'Convert', onConvertOptionClick ),
-			createOption( 'Flatten', onFlattenOptionClick )
-		];
-
-	}
+		createOption( 'Convert', onConvertOptionClick ),
+		createOption( 'Flatten', onFlattenOptionClick )
+	];
 
 	optionsPanel = UI.MenubarHelper.createOptionsPanel( menuConfig );
 

+ 16 - 15
editor/js/Menubar.File.js

@@ -2,6 +2,8 @@ Menubar.File = function ( editor ) {
 
 	var menuConfig,
 		optionsPanel,
+		createOption,
+		createDivider,
 		fileInput;
 
 
@@ -163,23 +165,22 @@ Menubar.File = function ( editor ) {
 	fileInput.addEventListener( 'change', onFileInputChange);
 
 	// configure menu contents
-	
-	with(UI.MenubarHelper) {
-
-		menuConfig   = [
-			createOption( 'New', onNewOptionClick ),
-			createDivider(),
 
-			createOption( 'Import', onImportOptionClick ),
-			createDivider(),
-
-			createOption( 'Export Geometry', onExportGeometryOptionClick ),
-			createOption( 'Export Object', onExportObjectOptionClick ),
-			createOption( 'Export Scene', onExportSceneOptionClick ),
-			createOption( 'Export OBJ', onExportOBJOptionClick )
-		];
+	createOption  = UI.MenubarHelper.createOption;
+	createDivider = UI.MenubarHelper.createDivider;
 	
-	}
+	menuConfig    = [
+		createOption( 'New', onNewOptionClick ),
+		createDivider(),
+
+		createOption( 'Import', onImportOptionClick ),
+		createDivider(),
+
+		createOption( 'Export Geometry', onExportGeometryOptionClick ),
+		createOption( 'Export Object', onExportObjectOptionClick ),
+		createOption( 'Export Scene', onExportSceneOptionClick ),
+		createOption( 'Export OBJ', onExportOBJOptionClick )
+	];
 
 	optionsPanel = UI.MenubarHelper.createOptionsPanel( menuConfig );
 

+ 8 - 7
editor/js/Menubar.Help.js

@@ -1,6 +1,8 @@
 Menubar.Help = function ( editor ) {
 
 	var menuConfig,
+		createOption,
+		createDivider,
 		optionsPanel;
 
 	// event handlers
@@ -19,14 +21,13 @@ Menubar.Help = function ( editor ) {
 
 	// configure menu contents
 
-	with(UI.MenubarHelper) {
+	createOption  = UI.MenubarHelper.createOption;
+	createDivider = UI.MenubarHelper.createDivider;
 
-		menuConfig = [
-			createOption( 'Source code', onSourcecodeOptionClick ),
-			createOption( 'About', onAboutOptionClick )
-		];
-
-	}
+	menuConfig    = [
+		createOption( 'Source code', onSourcecodeOptionClick ),
+		createOption( 'About', onAboutOptionClick )
+	];
 
 	optionsPanel = UI.MenubarHelper.createOptionsPanel( menuConfig );
 

+ 10 - 8
editor/js/Menubar.View.js

@@ -1,6 +1,9 @@
 Menubar.View = function ( editor ) {
+	
 	var menuConfig,
-		optionsPanel;
+		optionsPanel,
+		createOption,
+		createDivider;
 
 	function onLightThemeOptionClick () {
 
@@ -19,14 +22,13 @@ Menubar.View = function ( editor ) {
 
 	// configure menu contents
 
-	with(UI.MenubarHelper) {
-
-		menuConfig = [
-			createOption( 'Light theme', onLightThemeOptionClick ),
-			createOption( 'Dark theme', onDarkThemeOptionClick )
-		];
+	createOption  = UI.MenubarHelper.createOption;
+	createDivider = UI.MenubarHelper.createDivider;
 
-	}
+	menuConfig    = [
+		createOption( 'Light theme', onLightThemeOptionClick ),
+		createOption( 'Dark theme', onDarkThemeOptionClick )
+	];
 
 	optionsPanel = UI.MenubarHelper.createOptionsPanel( menuConfig );