aboutsummaryrefslogtreecommitdiff
path: root/js/panels/properties.reel/sections/custom.reel
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/sections/custom.reel
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/sections/custom.reel')
-rwxr-xr-xjs/panels/properties.reel/sections/custom.reel/custom.html15
1 files changed, 6 insertions, 9 deletions
diff --git a/js/panels/properties.reel/sections/custom.reel/custom.html b/js/panels/properties.reel/sections/custom.reel/custom.html
index 99a68264..cfc5208c 100755
--- a/js/panels/properties.reel/sections/custom.reel/custom.html
+++ b/js/panels/properties.reel/sections/custom.reel/custom.html
@@ -10,8 +10,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
10 <script type="text/montage-serialization"> 10 <script type="text/montage-serialization">
11 { 11 {
12 "owner": { 12 "owner": {
13 "module" : "js/panels/properties.reel/sections/custom.reel", 13 "prototype" : "js/panels/properties.reel/sections/custom.reel[CustomSection]",
14 "name" : "CustomSection",
15 "properties" : { 14 "properties" : {
16 "element" : {"#": "section"}, 15 "element" : {"#": "section"},
17 "repeat" : {"@": "repeat"} 16 "repeat" : {"@": "repeat"}
@@ -19,8 +18,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
19 }, 18 },
20 19
21 "repeat": { 20 "repeat": {
22 "module": "montage/ui/repetition.reel", 21 "prototype": "montage/ui/repetition.reel",
23 "name": "Repetition",
24 "properties": { 22 "properties": {
25 "element" : {"#": "repetitionContainer"} 23 "element" : {"#": "repetitionContainer"}
26 }, 24 },
@@ -34,8 +32,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
34 }, 32 },
35 33
36 "slot": { 34 "slot": {
37 "module": "montage/ui/slot.reel", 35 "prototype": "montage/ui/slot.reel",
38 "name": "Slot",
39 "properties": { 36 "properties": {
40 "element": { "#": "repeitionContent" } 37 "element": { "#": "repeitionContent" }
41 }, 38 },
@@ -52,9 +49,9 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
52 </script> 49 </script>
53</head> 50</head>
54<body> 51<body>
55 <div id="section" class="sectional"> 52 <div data-montage-id="section" class="sectional">
56 <div id="repetitionContainer"> 53 <div data-montage-id="repetitionContainer">
57 <div id="repeitionContent"></div> 54 <div data-montage-id="repeitionContent"></div>
58 </div> 55 </div>
59 </div> 56 </div>
60</body> 57</body>