diff options
| author | Jonathan Duran | 2012-06-05 08:42:53 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-06-05 08:42:53 -0700 |
| commit | bd2c28100f347afc10243c80b8a288746370eee2 (patch) | |
| tree | db507fe0fdbe8e6f98f7d0f022b29c8d5942b4f7 /js/components/layout/document-entry.reel/document-entry.html | |
| parent | 121d0e616f48aa7cd048763554089c20a1883d7a (diff) | |
| parent | c1ec69879028220b0c3f11ad6e24035bf527802c (diff) | |
| download | ninja-bd2c28100f347afc10243c80b8a288746370eee2.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/controllers/elements/element-controller.js
js/panels/Timeline/Layer.reel/Layer.js
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/components/layout/document-entry.reel/document-entry.html')
| -rwxr-xr-x | js/components/layout/document-entry.reel/document-entry.html | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/js/components/layout/document-entry.reel/document-entry.html b/js/components/layout/document-entry.reel/document-entry.html index 679ebb62..e68d17c5 100755 --- a/js/components/layout/document-entry.reel/document-entry.html +++ b/js/components/layout/document-entry.reel/document-entry.html | |||
| @@ -15,18 +15,31 @@ | |||
| 15 | "prototype": "js/components/layout/document-entry.reel", | 15 | "prototype": "js/components/layout/document-entry.reel", |
| 16 | "properties": { | 16 | "properties": { |
| 17 | "element": {"#": "documentEntry"}, | 17 | "element": {"#": "documentEntry"}, |
| 18 | "label": {"#": "name"}, | 18 | "label": {"#": "name"} |
| 19 | "activeBack": {"#": "isActive"} | ||
| 20 | } | 19 | } |
| 20 | }, | ||
| 21 | |||
| 22 | "closeButton": { | ||
| 23 | "prototype": "montage/ui/button.reel", | ||
| 24 | "properties": { | ||
| 25 | "element": {"#": "close-btn"}, | ||
| 26 | "identifier": "closeButton" | ||
| 27 | }, | ||
| 28 | "listeners": [ | ||
| 29 | { | ||
| 30 | "type": "action", | ||
| 31 | "listener": {"@": "owner"}, | ||
| 32 | "capture": false | ||
| 33 | } | ||
| 34 | ] | ||
| 21 | } | 35 | } |
| 22 | } | 36 | } |
| 23 | </script> | 37 | </script> |
| 24 | </head> | 38 | </head> |
| 25 | <body> | 39 | <body> |
| 26 | <li data-montage-id="documentEntry" class="documentEntry"> | 40 | <li data-montage-id="documentEntry" class="documentEntry"> |
| 27 | <div data-montage-id="isActive"></div> | ||
| 28 | <span data-montage-id="name"></span> | 41 | <span data-montage-id="name"></span> |
| 29 | <img src="js/components/layout/document-entry.reel/close_button.gif"> | 42 | <button type="button" class="documentCloseButton" data-montage-id="close-btn"></button> |
| 30 | </li> | 43 | </li> |
| 31 | </body> | 44 | </body> |
| 32 | </html> \ No newline at end of file | 45 | </html> \ No newline at end of file |