aboutsummaryrefslogtreecommitdiff
path: root/js/panels
diff options
context:
space:
mode:
Diffstat (limited to 'js/panels')
-rwxr-xr-xjs/panels/PanelContainer.reel/PanelContainer.html3
-rw-r--r--js/panels/objects/object.reel/object.js11
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 @@
74 }, 74 },
75 75
76 "panel_6": { 76 "panel_6": {
77 "module": "js/panels/Panel.reel", 77 "prototype": "js/panels/Panel.reel",
78 "name": "Panel",
79 "properties": { 78 "properties": {
80 "element": {"#": "panel_6"} 79 "element": {"#": "panel_6"}
81 }, 80 },
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, {
16 iconElement : { value: null }, 16 iconElement : { value: null },
17 type : { value: null }, 17 type : { value: null },
18 18
19
20 _name : { value: null },
21 name: {
22 get: function() {
23 return this._name;
24 },
25 set: function(val) {
26 this.name = val;
27 }
28 },
29
19 _sourceObject : { value: null }, 30 _sourceObject : { value: null },
20 sourceObject : { 31 sourceObject : {
21 get: function() { 32 get: function() {