diff options
| author | Jon Reid | 2012-05-15 11:24:53 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
| commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
| tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /js/panels/properties.reel/sections/custom-rows/dual-row.reel | |
| parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
| parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
| download | ninja-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-rows/dual-row.reel')
| -rwxr-xr-x | js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html index be4ae431..bdcbff7f 100755 --- a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html +++ b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.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/sections/custom-rows/dual-row.reel", | 12 | "prototype" : "js/panels/properties.reel/sections/custom-rows/dual-row.reel", |
| 13 | "name" : "DualRow", | ||
| 14 | "properties" : { | 13 | "properties" : { |
| 15 | "element" : {"#": "section"}, | 14 | "element" : {"#": "section"}, |
| 16 | "slot" : {"@": "slot"}, | 15 | "slot" : {"@": "slot"}, |
| @@ -18,8 +17,7 @@ | |||
| 18 | } | 17 | } |
| 19 | }, | 18 | }, |
| 20 | "slot": { | 19 | "slot": { |
| 21 | "module": "montage/ui/slot.reel", | 20 | "prototype": "montage/ui/slot.reel", |
| 22 | "name": "Slot", | ||
| 23 | "properties": { | 21 | "properties": { |
| 24 | "element": { "#": "slotElement" } | 22 | "element": { "#": "slotElement" } |
| 25 | }, | 23 | }, |
| @@ -31,8 +29,7 @@ | |||
| 31 | } | 29 | } |
| 32 | }, | 30 | }, |
| 33 | "slot2": { | 31 | "slot2": { |
| 34 | "module": "montage/ui/slot.reel", | 32 | "prototype": "montage/ui/slot.reel", |
| 35 | "name": "Slot", | ||
| 36 | "properties": { | 33 | "properties": { |
| 37 | "element": { "#": "slotElement2" } | 34 | "element": { "#": "slotElement2" } |
| 38 | }, | 35 | }, |
| @@ -47,17 +44,17 @@ | |||
| 47 | </script> | 44 | </script> |
| 48 | </head> | 45 | </head> |
| 49 | <body> | 46 | <body> |
| 50 | <div id="section"> | 47 | <div data-montage-id="section"> |
| 51 | <section class="fieldCol"> | 48 | <section class="fieldCol"> |
| 52 | <label class="lbl"></label> | 49 | <label class="lbl"></label> |
| 53 | <article class="fieldRow"> | 50 | <article class="fieldRow"> |
| 54 | <div id="slotElement" class="inputField"> | 51 | <div data-montage-id="slotElement" class="inputField"> |
| 55 | 52 | ||
| 56 | </div> | 53 | </div> |
| 57 | </article> | 54 | </article> |
| 58 | <label class="lbl"></label> | 55 | <label class="lbl"></label> |
| 59 | <article class="fieldRow"> | 56 | <article class="fieldRow"> |
| 60 | <div id="slotElement2" class="inputField"> | 57 | <div data-montage-id="slotElement2" class="inputField"> |
| 61 | 58 | ||
| 62 | </div> | 59 | </div> |
| 63 | </article> | 60 | </article> |