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

2 files changed, 12 insertions, 2 deletions

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() {