aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/document-entry.reel/document-entry.html
diff options
context:
space:
mode:
authorKruti Shah2012-06-12 13:09:11 -0700
committerKruti Shah2012-06-12 13:09:11 -0700
commitd648c842905c7c53e0f89b943982493d2b79f56e (patch)
treeeb5585f92061975215f6d19305a8d1b76262e2fc /js/components/layout/document-entry.reel/document-entry.html
parentbedb38e14887b29eae3cdf1c8d435259c920257c (diff)
parentcf3b96822665751dae7a64644db3cb3960733c3d (diff)
downloadninja-d648c842905c7c53e0f89b943982493d2b79f56e.tar.gz
Merge branch 'refs/heads/TimelineUberjd' into TimelineUber
Conflicts: js/controllers/elements/element-controller.js js/document/_toDelete/html-document.js js/panels/Timeline/Layer.reel/Layer.js Signed-off-by: Kruti Shah <kruti.shah@motorola.com>
Diffstat (limited to 'js/components/layout/document-entry.reel/document-entry.html')
-rwxr-xr-xjs/components/layout/document-entry.reel/document-entry.html21
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