aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/document-entry.reel/document-entry.html
diff options
context:
space:
mode:
authorJon Reid2012-05-15 11:24:53 -0700
committerJon Reid2012-05-15 11:24:53 -0700
commit3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch)
treed6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/components/layout/document-entry.reel/document-entry.html
parent53a604d0ccb1315576b94406cf3b0b958162307b (diff)
parente33a4e58c271a9507082694a5268b840fdd05968 (diff)
downloadninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz
Merge branch 'timeline-local' into timeline-multiselect
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js resolved using theirs. (selectLayers)
Diffstat (limited to 'js/components/layout/document-entry.reel/document-entry.html')
-rwxr-xr-xjs/components/layout/document-entry.reel/document-entry.html11
1 files changed, 5 insertions, 6 deletions
diff --git a/js/components/layout/document-entry.reel/document-entry.html b/js/components/layout/document-entry.reel/document-entry.html
index 1cf01737..679ebb62 100755
--- a/js/components/layout/document-entry.reel/document-entry.html
+++ b/js/components/layout/document-entry.reel/document-entry.html
@@ -1,4 +1,4 @@
1<!DOCTYPE html> 1<!DOCTYPE html>
2<!-- <copyright> 2<!-- <copyright>
3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/> 3 This file contains proprietary software owned by Motorola Mobility, Inc.<br/>
4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> 4 No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/>
@@ -12,8 +12,7 @@
12 { 12 {
13 13
14 "owner": { 14 "owner": {
15 "module": "js/components/layout/document-entry.reel", 15 "prototype": "js/components/layout/document-entry.reel",
16 "name": "DocumentEntry",
17 "properties": { 16 "properties": {
18 "element": {"#": "documentEntry"}, 17 "element": {"#": "documentEntry"},
19 "label": {"#": "name"}, 18 "label": {"#": "name"},
@@ -24,9 +23,9 @@
24 </script> 23 </script>
25 </head> 24 </head>
26 <body> 25 <body>
27 <li id="documentEntry" class="documentEntry"> 26 <li data-montage-id="documentEntry" class="documentEntry">
28 <div id="isActive"></div> 27 <div data-montage-id="isActive"></div>
29 <span id="name"></span> 28 <span data-montage-id="name"></span>
30 <img src="js/components/layout/document-entry.reel/close_button.gif"> 29 <img src="js/components/layout/document-entry.reel/close_button.gif">
31 </li> 30 </li>
32 </body> 31 </body>