aboutsummaryrefslogtreecommitdiff
path: root/js/components/layout/documents-tab.reel/documents-tab.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/documents-tab.reel/documents-tab.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/documents-tab.reel/documents-tab.html')
-rwxr-xr-xjs/components/layout/documents-tab.reel/documents-tab.html17
1 files changed, 7 insertions, 10 deletions
diff --git a/js/components/layout/documents-tab.reel/documents-tab.html b/js/components/layout/documents-tab.reel/documents-tab.html
index 737dfbcb..4aed23d9 100755
--- a/js/components/layout/documents-tab.reel/documents-tab.html
+++ b/js/components/layout/documents-tab.reel/documents-tab.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/>
@@ -14,16 +14,14 @@
14 { 14 {
15 15
16 "owner": { 16 "owner": {
17 "module": "js/components/layout/documents-tab.reel", 17 "prototype": "js/components/layout/documents-tab.reel",
18 "name": "DocumentsTab",
19 "properties": { 18 "properties": {
20 "element": {"#": "openDocumentsTabComponent"} 19 "element": {"#": "openDocumentsTabComponent"}
21 } 20 }
22 }, 21 },
23 22
24 "documentEntry": { 23 "documentEntry": {
25 "module": "js/components/layout/document-entry.reel", 24 "prototype": "js/components/layout/document-entry.reel",
26 "name": "DocumentEntry",
27 "properties": { 25 "properties": {
28 "element": {"#": "document"} 26 "element": {"#": "document"}
29 }, 27 },
@@ -52,8 +50,7 @@
52 }, 50 },
53 51
54 "repetition1": { 52 "repetition1": {
55 "module": "montage/ui/repetition.reel", 53 "prototype": "montage/ui/repetition.reel",
56 "name": "Repetition",
57 "properties": { 54 "properties": {
58 "element": {"#": "openDocuments"} 55 "element": {"#": "openDocuments"}
59 }, 56 },
@@ -72,9 +69,9 @@
72 </head> 69 </head>
73 70
74 <body> 71 <body>
75 <div id="openDocumentsTabComponent" class="documentsTab"> 72 <div data-montage-id="openDocumentsTabComponent" class="documentsTab">
76 <ul id="openDocuments" class="openDocuments"> 73 <ul data-montage-id="openDocuments" class="openDocuments">
77 <li id="document"></li> 74 <li data-montage-id="document"></li>
78 </ul> 75 </ul>
79 </div> 76 </div>
80 </body> 77 </body>