From 5b303f858ab78877f26f61e87230b010460ee03b Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Wed, 20 Jun 2012 11:28:32 -0700
Subject: Objects Tray - Filter list of components for those without visual
 representation

---
 js/panels/objects/object.reel/object.js | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

(limited to 'js/panels/objects/object.reel/object.js')

diff --git a/js/panels/objects/object.reel/object.js b/js/panels/objects/object.reel/object.js
index 76f1b5bf..b8bf1b1e 100644
--- a/js/panels/objects/object.reel/object.js
+++ b/js/panels/objects/object.reel/object.js
@@ -75,6 +75,22 @@ exports.Object = Montage.create(Component, {
 
     },
 
+    /* ---------------------
+     Event Handlers
+     --------------------- */
+
+    handleClick: {
+        value: function(e) {
+            this.parentComponent.parentComponent.displayHUDForObject(this.sourceObject);
+        }
+    },
+
+    prepareForDraw : {
+        value: function() {
+            this.iconElement.addEventListener('click', this, false);
+        }
+    },
+
     draw : {
         value: function() {
             if(this.type) {
-- 
cgit v1.2.3


From e9783135c3a6c95b7ccc3a6e45f40a030a2a067c Mon Sep 17 00:00:00 2001
From: Eric Guzman
Date: Wed, 20 Jun 2012 11:40:17 -0700
Subject: Objects Tray - Use label instead of identifier for object name

---
 js/panels/objects/object.reel/object.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'js/panels/objects/object.reel/object.js')

diff --git a/js/panels/objects/object.reel/object.js b/js/panels/objects/object.reel/object.js
index b8bf1b1e..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, {
 
             this._identifier = value;
 
-            this.label = value;
-
             this.needsDraw = true;
         }
         
@@ -67,8 +65,8 @@ exports.Object = Montage.create(Component, {
 
             this._montageMetaData = data;
 
-            if(!this.identifier && data.label) {
-                this.label = data.label;
+            if(data.label) {
+                this.name = data.label;
                 this.needsDraw = true;
             }
         }
-- 
cgit v1.2.3