diff options
author | Armen Kesablyan | 2012-06-15 15:03:26 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-15 15:03:26 -0700 |
commit | 45aeaaf9aa61dcd5a55f12817ef8e6036ba74606 (patch) | |
tree | bdbe9415a3ab5a1784de3af1814cfde8d5f75913 /js/panels/objects/object.reel/object.html | |
parent | 5bf62b3dacfff71d906286716dc0d73e2cb05bb8 (diff) | |
parent | 022e2ba65070ee1e5eb2d4b197b88768a1ea3f4f (diff) | |
download | ninja-45aeaaf9aa61dcd5a55f12817ef8e6036ba74606.tar.gz |
Merge branch 'binding' of https://github.com/dhg637/ninja-internal into binding
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 | ||