From 006e4b87f3aee46daa3108ecdb1e608129dbf37d Mon Sep 17 00:00:00 2001
From: "Mr.doob" <info@mrdoob.com>
Date: Thu, 25 Oct 2012 19:57:37 +0200
Subject: [PATCH] Editor: Refactored Sidebar files.

---
 editor/index.html                                     |  7 +++----
 ...bar.Properties.Geometry.js => Sidebar.Geometry.js} |  2 +-
 ...bar.Properties.Material.js => Sidebar.Material.js} |  2 +-
 ...bar.Properties.Object3D.js => Sidebar.Object3D.js} |  2 +-
 editor/js/ui/Sidebar.Properties.js                    | 11 -----------
 editor/js/ui/Sidebar.Scene.js                         |  2 +-
 editor/js/ui/Sidebar.js                               |  9 ++++-----
 7 files changed, 11 insertions(+), 24 deletions(-)
 rename editor/js/ui/{Sidebar.Properties.Geometry.js => Sidebar.Geometry.js} (98%)
 rename editor/js/ui/{Sidebar.Properties.Material.js => Sidebar.Material.js} (99%)
 rename editor/js/ui/{Sidebar.Properties.Object3D.js => Sidebar.Object3D.js} (99%)
 delete mode 100644 editor/js/ui/Sidebar.Properties.js

diff --git a/editor/index.html b/editor/index.html
index 284de33e1b..e8f1127385 100644
--- a/editor/index.html
+++ b/editor/index.html
@@ -42,10 +42,9 @@
 		<script src="js/ui/Menubar.Help.js"></script>
 		<script src="js/ui/Sidebar.js"></script>
 		<script src="js/ui/Sidebar.Scene.js"></script>
-		<script src="js/ui/Sidebar.Properties.js"></script>
-		<script src="js/ui/Sidebar.Properties.Object3D.js"></script>
-		<script src="js/ui/Sidebar.Properties.Geometry.js"></script>
-		<script src="js/ui/Sidebar.Properties.Material.js"></script>
+		<script src="js/ui/Sidebar.Object3D.js"></script>
+		<script src="js/ui/Sidebar.Geometry.js"></script>
+		<script src="js/ui/Sidebar.Material.js"></script>
 		<script src="js/ui/Viewport.js"></script>
 
 		<script>
diff --git a/editor/js/ui/Sidebar.Properties.Geometry.js b/editor/js/ui/Sidebar.Geometry.js
similarity index 98%
rename from editor/js/ui/Sidebar.Properties.Geometry.js
rename to editor/js/ui/Sidebar.Geometry.js
index b6d44c214c..2110bb3f6b 100644
--- a/editor/js/ui/Sidebar.Properties.Geometry.js
+++ b/editor/js/ui/Sidebar.Geometry.js
@@ -1,4 +1,4 @@
-Sidebar.Properties.Geometry = function ( signals ) {
+Sidebar.Geometry = function ( signals ) {
 
 	var geometries = {
 
diff --git a/editor/js/ui/Sidebar.Properties.Material.js b/editor/js/ui/Sidebar.Material.js
similarity index 99%
rename from editor/js/ui/Sidebar.Properties.Material.js
rename to editor/js/ui/Sidebar.Material.js
index c31abe0457..e7c31b3ce4 100644
--- a/editor/js/ui/Sidebar.Properties.Material.js
+++ b/editor/js/ui/Sidebar.Material.js
@@ -1,4 +1,4 @@
-Sidebar.Properties.Material = function ( signals ) {
+Sidebar.Material = function ( signals ) {
 
     var materials = {
 
diff --git a/editor/js/ui/Sidebar.Properties.Object3D.js b/editor/js/ui/Sidebar.Object3D.js
similarity index 99%
rename from editor/js/ui/Sidebar.Properties.Object3D.js
rename to editor/js/ui/Sidebar.Object3D.js
index 1a1b2d7ca9..2dd17442f9 100644
--- a/editor/js/ui/Sidebar.Properties.Object3D.js
+++ b/editor/js/ui/Sidebar.Object3D.js
@@ -1,4 +1,4 @@
-Sidebar.Properties.Object3D = function ( signals ) {
+Sidebar.Object3D = function ( signals ) {
 
 	var objects = {
 
diff --git a/editor/js/ui/Sidebar.Properties.js b/editor/js/ui/Sidebar.Properties.js
deleted file mode 100644
index 55a161ac02..0000000000
--- a/editor/js/ui/Sidebar.Properties.js
+++ /dev/null
@@ -1,11 +0,0 @@
-Sidebar.Properties = function ( signals ) {
-
-	var container = new UI.Panel();
-
-	container.add( new Sidebar.Properties.Object3D( signals ) );
-	container.add( new Sidebar.Properties.Geometry( signals ) );
-	container.add( new Sidebar.Properties.Material( signals ) );
-
-	return container;
-
-}
diff --git a/editor/js/ui/Sidebar.Scene.js b/editor/js/ui/Sidebar.Scene.js
index d4e9c13ab4..9f9c84fb46 100644
--- a/editor/js/ui/Sidebar.Scene.js
+++ b/editor/js/ui/Sidebar.Scene.js
@@ -1,4 +1,4 @@
-Sidebar.Outliner = function ( signals ) {
+Sidebar.Scene = function ( signals ) {
 
 	var objectTypes = {
 
diff --git a/editor/js/ui/Sidebar.js b/editor/js/ui/Sidebar.js
index a5a3eb81d4..ac0c1a4b9d 100644
--- a/editor/js/ui/Sidebar.js
+++ b/editor/js/ui/Sidebar.js
@@ -5,11 +5,10 @@ var Sidebar = function ( signals ) {
 	container.setBackgroundColor( '#eee' );
 	container.setOverflow( 'auto' );
 
-	var outliner = new Sidebar.Outliner( signals );
-	container.add( outliner );
-
-	var properties = new Sidebar.Properties( signals );
-	container.add( properties );
+	container.add( new Sidebar.Scene( signals ) );
+	container.add( new Sidebar.Object3D( signals ) );
+	container.add( new Sidebar.Geometry( signals ) );
+	container.add( new Sidebar.Material( signals ) );
 
 	return container;
 
-- 
GitLab