18 files changed, 69 insertions, 350 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index 0f02ca3c..ddaeb061 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -71,7 +71,7 @@ var DocumentController = exports.DocumentController = Montage.create(Component,
     handleAddComponentFirstDraw: {
         value: function (e) {
                 //TODO: Add logic to reparse the document for dynamically added styles
-                console.log(e);
+                //console.log(e);
         }
     },
     
diff --git a/js/data/panels-data.js b/js/data/panels-data.js
index 2422f5e7..7a2d817a 100644
--- a/js/data/panels-data.js
+++ b/js/data/panels-data.js
@@ -55,8 +55,8 @@ exports.PanelsData = Montage.create(Montage, {
             scrollable: true,
             collapsed: true,
             open: true,
-            modulePath: "js/panels/Components/ComponentsPanelBase.reel",
-            moduleName: "ComponentsPanelBase"
+            modulePath: "js/panels/components-panel.reel",
+            moduleName: "ComponentsPanel"
         },
 //        {
 //            name: "Project/Assets",
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",
-                "name": "ComponentsPanelBase",
+                "module": "js/panels/components-panel.reel",
+                "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..acbf702f 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"
                         }
@@ -230,9 +230,9 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component
                 case "select":
                     return "dropdown";
                 case "number":
-                    return "hottext";
+                    return "ht";
                 default:
-                    alert("Conversion not implemented for ", type);
+                    alert("Conversion not implemented for " + type);
             }
         }
     },
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.js b/js/panels/properties.reel/sections/custom.reel/custom.js
index ac316907..876fe110 100755
--- a/js/panels/properties.reel/sections/custom.reel/custom.js
+++ b/js/panels/properties.reel/sections/custom.reel/custom.js
@@ -15,6 +15,7 @@ var ColorSelect = require("js/panels/properties.reel/sections/custom-rows/color-
 
 // Components Needed to make this work
 var Hottext = require("js/components/hottextunit.reel").HotTextUnit;
+var HT = require("js/components/hottext.reel").HotText;
 var Dropdown = require("js/components/combobox.reel").Combobox;