Merge branch 'refs/heads/NinjaInternal' into Color

16 files changed, 735 insertions, 4 deletions

diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css
index 27d19e58..1b3c9184 100755
--- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css
+++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.css
@@ -10,6 +10,11 @@
         -webkit-box-orient: vertical;
     height:100%;
 }
+.css_panel .resizer {
+    background-color: #333;
+    cursor: row-resize;
+    height: 1px;
+}
 .nj-section-header {
         background-color: #333;
         border-top: 1px solid #3D3D3D;
@@ -37,7 +42,6 @@
     -webkit-box-flex: 0;
     background-color: #474747;
     color: #FFF;
-    max-height: 68px;
     overflow-y: scroll;
 }
 #nj-section-styles {
diff --git a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
index 5d6273b6..db630934 100755
--- a/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
+++ b/js/panels/CSSPanel/CSSPanelBase.reel/CSSPanelBase.html
@@ -10,6 +10,16 @@
                 <link rel="stylesheet" href="CSSPanelBase.css" type="text/css">
         <script type="text/montage-serialization">
         {
+            "resizer1": {
+                "module": "js/panels/Resizer",
+                "name": "Resizer",
+                "properties": {
+                    "element": {"#": "subPanelResizer"},
+                    "panel": {"#": "nj-section-stylesheets"},
+                    "isVertical": true
+                }
+            },
+
             "ComputedStyleSubPanel1": {
                 "module": "js/panels/CSSPanel/ComputedStyleSubPanel.reel",
                 "name": "ComputedStyleSubPanel",
@@ -43,6 +53,7 @@
                 <div  id="nj-css-stylesheet-toolbar" class="nj-css-toolbar">
                         <a href="#" id="nj-css-add-stylesheet" title="Add Stylesheet">Add Rule</a>
                 </div>
+        <div id="subPanelResizer" class="resizer"></div>
                 <!-- Style Rule list subsection -->
                 <h2 id="nj-css-styles-header" class="nj-section-header">
                         <div id="nj-css-styles-arrow" class="panelDisclosureIcon"></div>
diff --git a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
index 7e5a76ee..b4eec771 100755
--- a/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
+++ b/js/panels/Components/ComponentsPanelBase.reel/ComponentsPanelBase.js
@@ -26,14 +26,59 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component
                     "text": "Montage Components",
                     "children": [
                         {
+                            "text": "Anchor",
+                            "dataFile" : "node_modules/components-data/anchor.json",
+                            "component": "anchor"
+                        },
+                        {
                             "text": "Button",
                             "dataFile" : "node_modules/components-data/button.json",
                             "component": "button"
                         },
                         {
+                            "text": "Checkbox",
+                            "dataFile" : "node_modules/components-data/checkbox.json",
+                            "component": "checkbox"
+                        },
+                        {
+                            "text": "Image Component",
+                            "dataFile" : "node_modules/components-data/image.json",
+                            "component": "imageComponent"
+                        },
+                        {
+                            "text": "NumberInput",
+                            "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",
+                            "component": "radioButton"
+                        },
+                        {
+                            "text": "Range Input",
+                            "dataFile" : "node_modules/components-data/range-input.json",
+                            "component": "rangeInput"
+                        },
+                        {
+                            "text": "TextArea",
+                            "dataFile" : "node_modules/components-data/textarea.json",
+                            "component": "textarea"
+                        },
+                        {
                             "text": "Textfield",
                             "dataFile" : "node_modules/components-data/textfield.json",
                             "component": "textfield"
+                        },
+                        {
+                            "text": "Toogle Button",
+                            "dataFile" : "node_modules/components-data/toggle-button.json",
+                            "component": "toggleButton"
                         }
                     ]
                 }
@@ -119,6 +164,7 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component
                 row.prop = props.name;
                 row.defaultValue = props["default"];
                 row.label = props.name;
+                row.items = props.possibleValues;
 
                 section.Section.push([row]);
             }
@@ -147,6 +193,10 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component
                     return "textbox";
                 case "boolean":
                     return "checkbox";
+                case "select":
+                    return "dropdown";
+                case "number":
+                    return "hottext";
                 default:
                     alert("Conversion not implemented for ", type);
             }
@@ -211,6 +261,7 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component
 
                 NJevent("elementAdding", {"el": element, "data":styles});
             });
+
         }
     },
 
@@ -219,18 +270,62 @@ var ComponentsPanelBase = exports.ComponentsPanelBase = Montage.create(Component
             var el;
 
             switch(name) {
+                case "anchor":
+                    el = NJUtils.makeNJElement("a", "Anchor", "component");
+                    el.elementModel.pi = "AnchorPi";
+                    el.setAttribute("href", "http://www.motorola.com");
+                    el.innerHTML = "link";
+                    break;
                 case "button":