4 files changed, 10 insertions, 57 deletions
diff --git a/js/panels/Components/ComponentsPanel.js b/js/panels/Components/ComponentsPanel.js
deleted file mode 100755
index df1d74bb..00000000
--- a/js/panels/Components/ComponentsPanel.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/* <copyright>
-This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
-No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
-(c) Copyright 2011 Motorola Mobility, Inc.  All Rights Reserved.
-</copyright> */
-var Montage = require("montage/core/core").Montage;
-var     PanelBase = require("js/panels/PanelBase").PanelBase;
-var ComponentsPanelBase = require("js/panels/Components/ComponentsPanelBase.reel").ComponentsPanelBase;
-exports.ComponentsPanel = Montage.create(PanelBase, {
-    id : {value : "componentsPanel", writable:true, enumerable:true, configurable:true},
-    panelName : {value : "Components", writable:true, enumerable:true, configurable:true},
-    panelHeaderID : {value : "componentsPanelHeader", writable:true, enumerable:true, configurable:true},
-    disclosureIconID : {value : "componentsPanelDisclosureIcon", writable:true, enumerable:true, configurable:true},
-    closeButtonID : {value : "componentsPanelCloseButton", writable:true, enumerable:true, configurable:true},
-    panelContentID : {value : "componentsPanelContent", writable:true, enumerable:true, configurable:true},
-    init : {
-        value : function()
-        {
-            this.contentHeight = 200;
-            this.minHeight = 100;
-            this.defaultHeight = 200;
-            /* OLD WAY -- Removing the temporary div
-            // TODO: Remove this comment once this is tested.
-            var panelContainer = document.createElement("div");
-            this._componentsPanelBase = ComponentsPanelBase.create();
-            this._componentsPanelBase.element = panelContainer;
-            this.content = this._componentsPanelBase;
-            this._componentsPanelBase.needsDraw = true;
-            */
-            this.content = ComponentsPanelBase.create();
-        }
-    },
-    _componentsPanelBase:{
-        enumerable: true,
-        value: null,
-        writable:true
-    }
-});
-\ No newline at end of file
diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.css b/js/panels/components-panel.reel/components-panel.css
index ac250c83..ac250c83 100755
--- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.css
+++ b/js/panels/components-panel.reel/components-panel.css
diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.html b/js/panels/components-panel.reel/components-panel.html
index 6d7c8a2c..f598a1ee 100755
--- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.html
+++ b/js/panels/components-panel.reel/components-panel.html
@@ -7,13 +7,13 @@
 <html lang="en">
        <head>
        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-        <link rel="stylesheet" type="text/css" href="ComponentsPanelBase.css">
+        <link rel="stylesheet" type="text/css" href="components-panel.css">
        <script type="text/montage-serialization">
        {
            "owner": {
-                "module": "js/panels/Components/ComponentsPanelBase.reel",
+                "module": "js/panels/components-panel.reel",
-                "name": "ComponentsPanelBase",
+                "name": "ComponentsPanel",
                "properties": {
                    "element": {"#": "components_panel"},
                    "controller": {"@": "componentsTree"}
diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js b/js/panels/components-panel.reel/components-panel.js
index e990551b..96713691 100755
--- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
+++ b/js/panels/components-panel.reel/components-panel.js
@@ -16,7 +16,7 @@ String.prototype.capitalizeFirstChar = function() {
 };
-var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component, {
+exports.ComponentsPanel = Montage.create(Component, {
    components: {
        value: {
@@ -80,11 +80,6 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component
                            "dataFile" : "node_modules/components-data/number-input.json",
                            "component": "numberInput"
                        },
-                       {
-                            "text": "Select Input",
-                            "dataFile" : "node_modules/components-data/select.json",
-                            "component": "select"
-                        },
                        {
                            "text": "Radio Button",
                            "dataFile" : "node_modules/components-data/radio-button.json",
@@ -96,6 +91,11 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component
                            "component": "rangeInput"
                        },
                        {
+                            "text": "Select Input",
+                            "dataFile" : "node_modules/components-data/select.json",
+                            "component": "select"
+                        },
+                        {
                            "text": "TextArea",
                            "dataFile" : "node_modules/components-data/textarea.json",
                            "component": "textarea"
@@ -106,7 +106,7 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component
                            "component": "textfield"
                        },
                        {
-                            "text": "Toogle Button",
+                            "text": "Toggle Button",
                            "dataFile" : "node_modules/components-data/toggle-button.json",
                            "component": "toggleButton"
                        }

diff --git a/js/panels/Components/ComponentsPanel.js b/js/panels/Components/ComponentsPanel.js deleted file mode 100755 index df1d74bb..00000000 --- a/js/panels/Components/ComponentsPanel.js +++ /dev/null
@@ -1,47 +0,0 @@
1	/* <copyright>
2	This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
3	No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
4	(c) Copyright 2011 Motorola Mobility, Inc. All Rights Reserved.
5	</copyright> */
6
7	var Montage = require("montage/core/core").Montage;
8
9	var PanelBase = require("js/panels/PanelBase").PanelBase;
10	var ComponentsPanelBase = require("js/panels/Components/ComponentsPanelBase.reel").ComponentsPanelBase;
11
12	exports.ComponentsPanel = Montage.create(PanelBase, {
13	id : {value : "componentsPanel", writable:true, enumerable:true, configurable:true},
14	panelName : {value : "Components", writable:true, enumerable:true, configurable:true},
15	panelHeaderID : {value : "componentsPanelHeader", writable:true, enumerable:true, configurable:true},
16	disclosureIconID : {value : "componentsPanelDisclosureIcon", writable:true, enumerable:true, configurable:true},
17	closeButtonID : {value : "componentsPanelCloseButton", writable:true, enumerable:true, configurable:true},
18	panelContentID : {value : "componentsPanelContent", writable:true, enumerable:true, configurable:true},
19
20	init : {
21	value : function()
22	{
23	this.contentHeight = 200;
24	this.minHeight = 100;
25	this.defaultHeight = 200;
26
27	/* OLD WAY -- Removing the temporary div
28	// TODO: Remove this comment once this is tested.
29	var panelContainer = document.createElement("div");
30	this._componentsPanelBase = ComponentsPanelBase.create();
31	this._componentsPanelBase.element = panelContainer;
32
33	this.content = this._componentsPanelBase;
34	this._componentsPanelBase.needsDraw = true;
35	*/
36
37	this.content = ComponentsPanelBase.create();
38	}
39	},
40
41	_componentsPanelBase:{
42	enumerable: true,
43	value: null,
44	writable:true
45	}
46
47	}); \ No newline at end of file


diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.css b/js/panels/components-panel.reel/components-panel.css index ac250c83..ac250c83 100755 --- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.css +++ b/js/panels/components-panel.reel/components-panel.css


diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.html b/js/panels/components-panel.reel/components-panel.html index 6d7c8a2c..f598a1ee 100755 --- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.html +++ b/js/panels/components-panel.reel/components-panel.html
@@ -7,13 +7,13 @@
7	<html lang="en">	7	<html lang="en">
8	<head>	8	<head>
9	<meta http-equiv="content-type" content="text/html; charset=utf-8" />	9	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
10	<link rel="stylesheet" type="text/css" href="ComponentsPanelBase.css">	10	<link rel="stylesheet" type="text/css" href="components-panel.css">
11		11
12	<script type="text/montage-serialization">	12	<script type="text/montage-serialization">
13	{	13	{
14	"owner": {	14	"owner": {
15	"module": "js/panels/Components/ComponentsPanelBase.reel",	15	"module": "js/panels/components-panel.reel",
16	"name": "ComponentsPanelBase",	16	"name": "ComponentsPanel",
17	"properties": {	17	"properties": {
18	"element": {"#": "components_panel"},	18	"element": {"#": "components_panel"},
19	"controller": {"@": "componentsTree"}	19	"controller": {"@": "componentsTree"}


diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js b/js/panels/components-panel.reel/components-panel.js index e990551b..96713691 100755 --- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js +++ b/js/panels/components-panel.reel/components-panel.js
@@ -16,7 +16,7 @@ String.prototype.capitalizeFirstChar = function() {
16	};	16	};
17		17
18		18
19	var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component, {	19	exports.ComponentsPanel = Montage.create(Component, {
20		20
21	components: {	21	components: {
22	value: {	22	value: {
@@ -80,11 +80,6 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component
80	"dataFile" : "node_modules/components-data/number-input.json",	80	"dataFile" : "node_modules/components-data/number-input.json",
81	"component": "numberInput"	81	"component": "numberInput"
82	},	82	},
83	{
84	"text": "Select Input",
85	"dataFile" : "node_modules/components-data/select.json",
86	"component": "select"
87	},
88	{	83	{
89	"text": "Radio Button",	84	"text": "Radio Button",
90	"dataFile" : "node_modules/components-data/radio-button.json",	85	"dataFile" : "node_modules/components-data/radio-button.json",
@@ -96,6 +91,11 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component
96	"component": "rangeInput"	91	"component": "rangeInput"
97	},	92	},
98	{	93	{
		94	"text": "Select Input",
		95	"dataFile" : "node_modules/components-data/select.json",
		96	"component": "select"
		97	},
		98	{
99	"text": "TextArea",	99	"text": "TextArea",
100	"dataFile" : "node_modules/components-data/textarea.json",	100	"dataFile" : "node_modules/components-data/textarea.json",
101	"component": "textarea"	101	"component": "textarea"
@@ -106,7 +106,7 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component
106	"component": "textfield"	106	"component": "textfield"
107	},	107	},
108	{	108	{
109	"text": "Toogle Button",	109	"text": "Toggle Button",
110	"dataFile" : "node_modules/components-data/toggle-button.json",	110	"dataFile" : "node_modules/components-data/toggle-button.json",
111	"component": "toggleButton"	111	"component": "toggleButton"
112	}	112	}