diff options
-rw-r--r-- | js/panels/objects/object.reel/object.css | 2 | ||||
-rw-r--r-- | js/panels/objects/object.reel/object.html | 10 | ||||
-rw-r--r-- | js/panels/objects/object.reel/object.js | 6 |
3 files changed, 6 insertions, 12 deletions
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 @@ | |||
43 | margin: 0 auto 5px; | 43 | margin: 0 auto 5px; |
44 | width: 50px; | 44 | width: 50px; |
45 | } | 45 | } |
46 | .object-label { | 46 | .object-name { |
47 | color: #fff; | 47 | color: #fff; |
48 | display: block; | 48 | display: block; |
49 | text-align: center; | 49 | 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 @@ | |||
21 | "labelText": { | 21 | "labelText": { |
22 | "prototype": "montage/ui/dynamic-text.reel", | 22 | "prototype": "montage/ui/dynamic-text.reel", |
23 | "properties": { | 23 | "properties": { |
24 | "element": {"#": "label" } | 24 | "element": {"#": "name" } |
25 | }, | 25 | }, |
26 | "bindings": { | 26 | "bindings": { |
27 | "value" : { | 27 | "value" : {"<-": "@owner.name"} |
28 | "boundObject": {"@": "owner"}, | ||
29 | "boundObjectPropertyPath": "label", | ||
30 | "oneway": true | ||
31 | } | ||
32 | } | 28 | } |
33 | } | 29 | } |
34 | 30 | ||
@@ -41,7 +37,7 @@ | |||
41 | 37 | ||
42 | <li data-montage-id="object" draggable="true"> | 38 | <li data-montage-id="object" draggable="true"> |
43 | <div data-montage-id="object-icon" class="object-icon"></div> | 39 | <div data-montage-id="object-icon" class="object-icon"></div> |
44 | <span data-montage-id="label" class="object-label"></span> | 40 | <span data-montage-id="name" class="object-name"></span> |
45 | </li> | 41 | </li> |
46 | 42 | ||
47 | </body> | 43 | </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, { | |||
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,8 +65,8 @@ 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 | } |