aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/section.reel/section.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/panels/properties.reel/section.reel/section.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/panels/properties.reel/section.reel/section.html')
-rwxr-xr-xjs/panels/properties.reel/section.reel/section.html15
1 files changed, 6 insertions, 9 deletions
diff --git a/js/panels/properties.reel/section.reel/section.html b/js/panels/properties.reel/section.reel/section.html
index b72a91b3..c9b14565 100755
--- a/js/panels/properties.reel/section.reel/section.html
+++ b/js/panels/properties.reel/section.reel/section.html
@@ -9,8 +9,7 @@
9 <script type="text/montage-serialization"> 9 <script type="text/montage-serialization">
10 { 10 {
11 "owner": { 11 "owner": {
12 "module" : "js/panels/properties.reel/section.reel", 12 "prototype" : "js/panels/properties.reel/section.reel",
13 "name" : "Section",
14 "properties" : { 13 "properties" : {
15 "element" : {"#": "section"}, 14 "element" : {"#": "section"},
16 "slot" : {"@": "sectionSlot"} 15 "slot" : {"@": "sectionSlot"}
@@ -18,16 +17,14 @@
18 }, 17 },
19 18
20 "sectionSlot": { 19 "sectionSlot": {
21 "module": "montage/ui/slot.reel", 20 "prototype": "montage/ui/slot.reel",
22 "name": "Slot",
23 "properties": { 21 "properties": {
24 "element": {"#": "sectionSlot"} 22 "element": {"#": "sectionSlot"}
25 } 23 }
26 }, 24 },
27 25
28 "sectionSplitter": { 26 "sectionSplitter": {
29 "module": "js/panels/Splitter", 27 "prototype": "js/panels/Splitter",
30 "name": "Splitter",
31 "properties": { 28 "properties": {
32 "element": {"#": "sectionSplitter"}, 29 "element": {"#": "sectionSplitter"},
33 "panel": {"@": "sectionSlot"} 30 "panel": {"@": "sectionSlot"}
@@ -39,12 +36,12 @@
39 </script> 36 </script>
40</head> 37</head>
41<body> 38<body>
42 <div id="section"> 39 <div data-montage-id="section">
43 <h2 id="sectionSplitter" class="subSectionHeader"> 40 <h2 data-montage-id="sectionSplitter" class="subSectionHeader">
44 <section class="arrow"><div class="arrowIcon animated"></div></section> 41 <section class="arrow"><div class="arrowIcon animated"></div></section>
45 <section class="title"></section> 42 <section class="title"></section>
46 </h2> 43 </h2>
47 <div id="sectionSlot" class="animated"></div> 44 <div data-montage-id="sectionSlot" class="animated"></div>
48 </div> 45 </div>
49</body> 46</body>
50</html> \ No newline at end of file 47</html> \ No newline at end of file