Merge branch 'binding' of github.com:dhg637/ninja-internal into binding

5 files changed, 15 insertions, 6 deletions

diff --git a/js/components/toolbar.reel/toolbar.html b/js/components/toolbar.reel/toolbar.html
index 51e7ebec..c23e082f 100644
--- a/js/components/toolbar.reel/toolbar.html
+++ b/js/components/toolbar.reel/toolbar.html
@@ -19,8 +19,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
             },
             
             "buttonList": {
-                "module": "montage/ui/repetition.reel",
-                "name": "Repetition",
+                "prototype" : "montage/ui/repetition.reel",
                 "properties": {
                     "element": {"#": "repetition"}
                 },
diff --git a/js/panels/PanelContainer.reel/PanelContainer.html b/js/panels/PanelContainer.reel/PanelContainer.html
index ed6e8463..820348d2 100755
--- a/js/panels/PanelContainer.reel/PanelContainer.html
+++ b/js/panels/PanelContainer.reel/PanelContainer.html
@@ -74,8 +74,7 @@
             },
 
             "panel_6": {
-                "module": "js/panels/Panel.reel",
-                "name": "Panel",
+                "prototype": "js/panels/Panel.reel",
                 "properties": {
                     "element": {"#": "panel_6"}
                 },
diff --git a/js/panels/objects/object.reel/object.js b/js/panels/objects/object.reel/object.js
index 6f8f5c92..1426f800 100644
--- a/js/panels/objects/object.reel/object.js
+++ b/js/panels/objects/object.reel/object.js
@@ -16,6 +16,17 @@ exports.Object = Montage.create(Component, {
     iconElement              : { value: null },
     type                     : { value: null },
 
+
+    _name : { value: null },
+    name: {
+        get: function() {
+            return this._name;
+        },
+        set: function(val) {
+            this.name = val;
+        }
+    },
+
     _sourceObject : { value: null },
     sourceObject : {
         get: function() {
diff --git a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css
index ef1423c4..680f9183 100755
--- a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css
+++ b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.css
@@ -100,6 +100,5 @@
 
 
 .hudRepetition {
-    max-height:54px;
     overflow: hidden;
 }
\ No newline at end of file
diff --git a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js
index 52bc7236..9918b06d 100755
--- a/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js
+++ b/js/stage/binding-view.reel/binding-hud.reel/binding-hud.js
@@ -25,7 +25,7 @@ exports.BindingHud = Montage.create(Component, {
         value: null
     },
     scrollSpace: {
-        value: 3
+        value: 8
     },
     currentScrollDirection: {
         value: null
@@ -198,6 +198,7 @@ exports.BindingHud = Montage.create(Component, {
                 this.scrollDown.addEventListener("mouseover", this);
                 this.scrollUp.addEventListener("mouseout", this);
                 this.scrollDown.addEventListener("mouseout", this);
+                this.optionsRepeater.element.style.maxHeight = (this.scrollSpace * 18) + "px"
                 this.scrollUp.style.display = "block";
                 this.scrollDown.style.display = "block";
             }