diff options
author | Armen Kesablyan | 2012-06-15 15:02:30 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-15 15:02:30 -0700 |
commit | 022e2ba65070ee1e5eb2d4b197b88768a1ea3f4f (patch) | |
tree | 57ee0bd85f89d8b9c880337e14224536690810a4 /js/panels/objects/object.reel/object.html | |
parent | 60e9ea67e0f6d0cf167b6d5068e2e01db5f67966 (diff) | |
parent | 62c7c2ac7b72c7e89611d064eef1f4f77a54696d (diff) | |
download | ninja-022e2ba65070ee1e5eb2d4b197b88768a1ea3f4f.tar.gz |
Merge pull request #13 from ericguzman/binding
Added Objects Tray
Diffstat (limited to 'js/panels/objects/object.reel/object.html')
-rw-r--r-- | js/panels/objects/object.reel/object.html | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/js/panels/objects/object.reel/object.html b/js/panels/objects/object.reel/object.html index a072ab5e..6274f480 100644 --- a/js/panels/objects/object.reel/object.html +++ b/js/panels/objects/object.reel/object.html | |||
@@ -14,7 +14,8 @@ | |||
14 | "owner": { | 14 | "owner": { |
15 | "prototype": "js/panels/objects/object.reel", | 15 | "prototype": "js/panels/objects/object.reel", |
16 | "properties": { | 16 | "properties": { |
17 | "element": {"#": "object"} | 17 | "element": {"#": "object"}, |
18 | "iconElement": { "#": "object-icon"} | ||
18 | } | 19 | } |
19 | }, | 20 | }, |
20 | "labelText": { | 21 | "labelText": { |
@@ -39,7 +40,7 @@ | |||
39 | 40 | ||
40 | 41 | ||
41 | <li data-montage-id="object" draggable="true"> | 42 | <li data-montage-id="object" draggable="true"> |
42 | <div class="object-icon"></div> | 43 | <div data-montage-id="object-icon" class="object-icon"></div> |
43 | <span data-montage-id="label" class="object-label"></span> | 44 | <span data-montage-id="label" class="object-label"></span> |
44 | </li> | 45 | </li> |
45 | 46 | ||