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.css  |  2 +-
 js/panels/objects/object.reel/object.html | 10 +++-------
 js/panels/objects/object.reel/object.js   |  6 ++----
 3 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'js/panels')

diff --git a/js/panels/objects/object.reel/object.css b/js/panels/objects/object.reel/object.css
index f090ade6..79b7647c 100644
--- a/js/panels/objects/object.reel/object.css
+++ b/js/panels/objects/object.reel/object.css
@@ -43,7 +43,7 @@
     margin:  0 auto 5px;
     width: 50px;
 }
-.object-label {
+.object-name {
     color: #fff;
     display: block;
     text-align: center;
diff --git a/js/panels/objects/object.reel/object.html b/js/panels/objects/object.reel/object.html
index 6274f480..f9de1499 100644
--- a/js/panels/objects/object.reel/object.html
+++ b/js/panels/objects/object.reel/object.html
@@ -21,14 +21,10 @@
             "labelText": {
                 "prototype": "montage/ui/dynamic-text.reel",
                 "properties": {
-                    "element": {"#": "label" }
+                    "element": {"#": "name" }
                 },
                 "bindings": {
-                    "value" : {
-                        "boundObject": {"@": "owner"},
-                        "boundObjectPropertyPath": "label",
-                        "oneway": true
-                    }
+                    "value" : {"<-": "@owner.name"}
                 }
             }
 
@@ -41,7 +37,7 @@
 
 <li data-montage-id="object" draggable="true">
     <div data-montage-id="object-icon" class="object-icon"></div>
-    <span data-montage-id="label" class="object-label"></span>
+    <span data-montage-id="name" class="object-name"></span>
 </li>
 
 </body>
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