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/single-row.reel/single-row.html | |
| 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/single-row.reel/single-row.html')
| -rwxr-xr-x | js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html b/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html index 4de3f1ae..88f12186 100755 --- a/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html +++ b/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html | |||
| @@ -9,16 +9,14 @@ | |||
| 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/single-row.reel", | 12 | "prototype" : "js/panels/properties.reel/sections/custom-rows/single-row.reel", |
| 13 | "name" : "SingleRow", | ||
| 14 | "properties" : { | 13 | "properties" : { |
| 15 | "element" : {"#": "section"}, | 14 | "element" : {"#": "section"}, |
| 16 | "slot" : {"@": "slot"} | 15 | "slot" : {"@": "slot"} |
| 17 | } | 16 | } |
| 18 | }, | 17 | }, |
| 19 | "slot": { | 18 | "slot": { |
| 20 | "module": "montage/ui/slot.reel", | 19 | "prototype": "montage/ui/slot.reel", |
| 21 | "name": "Slot", | ||
| 22 | "properties": { | 20 | "properties": { |
| 23 | "element": { "#": "slotElement" } | 21 | "element": { "#": "slotElement" } |
| 24 | }, | 22 | }, |
| @@ -33,11 +31,11 @@ | |||
| 33 | </script> | 31 | </script> |
| 34 | </head> | 32 | </head> |
| 35 | <body> | 33 | <body> |
| 36 | <div id="section"> | 34 | <div data-montage-id="section"> |
| 37 | <section class="fieldCol"> | 35 | <section class="fieldCol"> |
| 38 | <label><span class="lbl"></span></label> | 36 | <label><span class="lbl"></span></label> |
| 39 | <article class="fieldRow"> | 37 | <article class="fieldRow"> |
| 40 | <div id="slotElement" class="inputField"> | 38 | <div data-montage-id="slotElement" class="inputField"> |
| 41 | 39 | ||
| 42 | </div> | 40 | </div> |
| 43 | </article> | 41 | </article> |