11 files changed, 15 insertions, 146 deletions

diff --git a/js/controllers/document-controller.js b/js/controllers/document-controller.js
index a308f191..97ea834b 100755
--- a/js/controllers/document-controller.js
+++ b/js/controllers/document-controller.js
@@ -80,7 +80,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 3505393c..9252b7b8 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: {
diff --git a/node_modules/components-data/anchor.json b/node_modules/components-data/anchor.json
index 04faf04d..028a759b 100644
--- a/node_modules/components-data/anchor.json
+++ b/node_modules/components-data/anchor.json
@@ -18,29 +18,10 @@
             "default": ""
         },
         {
-            "name": "hreflang",
-            "type": "string",
-            "default": ""
-        },
-        {
-            "name": "media",
-            "type": "string",
-            "default": ""
-        },
-        {
-            "name": "rel",
-            "type": "string",
-            "default": ""
-        },
-        {
             "name": "target",
-            "type": "string",
-            "default": ""
-        },
-        {
-            "name": "type",
-            "type": "string",
-            "default": ""
+            "type": "select",
+            "default": "_self",
+            "possibleValues": ["_self", "_blank", "_parent", "_top"]
         }
     ]
 }
\ No newline at end of file
diff --git a/node_modules/components-data/button.json b/node_modules/components-data/button.json
index 3f30030e..f3c16e8a 100644
--- a/node_modules/components-data/button.json
+++ b/node_modules/components-data/button.json
@@ -13,46 +13,11 @@
             "default": "Button"
         },
         {
-            "name": "autofocus",
-            "type": "boolean",
-            "default": "false"
-        },
-        {
             "name": "enabled",
             "type": "boolean",
             "default": "true"
         },
         {
-            "name": "form",
-            "type": "string",
-            "default": ""
-        },
-        {
-            "name": "formaction",
-            "type": "string",
-            "default": ""
-        },
-        {
-            "name": "formenctype",
-            "type": "string",
-            "default": ""
-        },
-        {
-            "name": "formmethod",
-            "type": "string",
-            "default": ""
-        },
-        {
-            "name": "formnovalidate",
-            "type": "boolean",
-            "default": ""
-        },
-        {
-            "name": "formtarget",
-            "type": "string",
-            "default": ""
-        },
-        {
             "name": "name",
             "type": "string",
             "default": ""
diff --git a/node_modules/components-data/checkbox.json b/node_modules/components-data/checkbox.json
index a03ee00f..cd851f67 100644
--- a/node_modules/components-data/checkbox.json
+++ b/node_modules/components-data/checkbox.json
@@ -8,11 +8,6 @@