diff options
| author | Valerio Virgillito | 2012-04-27 14:21:35 -0700 |
|---|---|---|
| committer | Valerio Virgillito | 2012-04-27 14:21:35 -0700 |
| commit | b08cc404d32dd1d4dbc2139ce8f06d7d88b681a8 (patch) | |
| tree | ae45391131c7c5203ae8e0d3470d106d835c8c6b /js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html | |
| parent | 314709dd189807bfc762aa150bb1b29d2ccdf25b (diff) | |
| parent | 6c1aa27b7753bc9007514859b42160fae265740d (diff) | |
| download | ninja-b08cc404d32dd1d4dbc2139ce8f06d7d88b681a8.tar.gz | |
Merge branch 'refs/heads/serialization'
Diffstat (limited to 'js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html')
| -rwxr-xr-x | js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html b/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html index 58a50a0d..990dc739 100755 --- a/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.html +++ b/js/panels/properties.reel/sections/custom-rows/color-select.reel/color-select.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/color-select.reel", | 12 | "prototype" : "js/panels/properties.reel/sections/custom-rows/color-select.reel", |
| 13 | "name" : "ColorSelect", | ||
| 14 | "properties" : { | 13 | "properties" : { |
| 15 | "element" : {"#": "section"}, | 14 | "element" : {"#": "section"}, |
| 16 | "Stroke" : {"#": "Stroke"}, | 15 | "Stroke" : {"#": "Stroke"}, |
| @@ -22,16 +21,14 @@ | |||
| 22 | 21 | ||
| 23 | 22 | ||
| 24 | "colorChip": { | 23 | "colorChip": { |
| 25 | "module" : "js/components/ui/color-chip.reel", | 24 | "prototype" : "js/components/ui/color-chip.reel", |
| 26 | "name" : "ColorChip", | ||
| 27 | "properties" : { | 25 | "properties" : { |
| 28 | "element" : {"#": "Stroke"} | 26 | "element" : {"#": "Stroke"} |
| 29 | } | 27 | } |
| 30 | }, | 28 | }, |
| 31 | 29 | ||
| 32 | "colorChip2": { | 30 | "colorChip2": { |
| 33 | "module" : "js/components/ui/color-chip.reel", | 31 | "prototype" : "js/components/ui/color-chip.reel", |
| 34 | "name" : "ColorChip", | ||
| 35 | "properties" : { | 32 | "properties" : { |
| 36 | "element" : {"#": "Fill"}, | 33 | "element" : {"#": "Fill"}, |
| 37 | "mode": "fill" | 34 | "mode": "fill" |