diff options
Diffstat (limited to 'js/panels/objects/object.reel/object.js')
-rw-r--r-- | js/panels/objects/object.reel/object.js | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/js/panels/objects/object.reel/object.js b/js/panels/objects/object.reel/object.js index 76f1b5bf..6f8f5c92 100644 --- a/js/panels/objects/object.reel/object.js +++ b/js/panels/objects/object.reel/object.js | |||
@@ -48,8 +48,6 @@ exports.Object = Montage.create(Component, { | |||
48 | 48 | ||
49 | this._identifier = value; | 49 | this._identifier = value; |
50 | 50 | ||
51 | this.label = value; | ||
52 | |||
53 | this.needsDraw = true; | 51 | this.needsDraw = true; |
54 | } | 52 | } |
55 | 53 | ||
@@ -67,14 +65,30 @@ exports.Object = Montage.create(Component, { | |||
67 | 65 | ||
68 | this._montageMetaData = data; | 66 | this._montageMetaData = data; |
69 | 67 | ||
70 | if(!this.identifier && data.label) { | 68 | if(data.label) { |
71 | this.label = data.label; | 69 | this.name = data.label; |
72 | this.needsDraw = true; | 70 | this.needsDraw = true; |
73 | } | 71 | } |
74 | } | 72 | } |
75 | 73 | ||
76 | }, | 74 | }, |
77 | 75 | ||
76 | /* --------------------- | ||
77 | Event Handlers | ||
78 | --------------------- */ | ||
79 | |||
80 | handleClick: { | ||
81 | value: function(e) { | ||
82 | this.parentComponent.parentComponent.displayHUDForObject(this.sourceObject); | ||
83 | } | ||
84 | }, | ||
85 | |||
86 | prepareForDraw : { | ||
87 | value: function() { | ||
88 | this.iconElement.addEventListener('click', this, false); | ||
89 | } | ||
90 | }, | ||
91 | |||
78 | draw : { | 92 | draw : { |
79 | value: function() { | 93 | value: function() { |
80 | if(this.type) { | 94 | if(this.type) { |