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/components/tools-properties/oval-properties.reel/oval-properties.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/components/tools-properties/oval-properties.reel/oval-properties.html')
| -rwxr-xr-x | js/components/tools-properties/oval-properties.reel/oval-properties.html | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/js/components/tools-properties/oval-properties.reel/oval-properties.html b/js/components/tools-properties/oval-properties.reel/oval-properties.html index 942ba9b0..c76e8c39 100755 --- a/js/components/tools-properties/oval-properties.reel/oval-properties.html +++ b/js/components/tools-properties/oval-properties.reel/oval-properties.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE HTML> | 1 | <!DOCTYPE HTML> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> | 3 | This file contains proprietary software owned by Motorola Mobility, Inc.<br/> |
| 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> | 4 | No rights, expressed or implied, whatsoever to this software are provided by Motorola Mobility, Inc. hereunder.<br/> |
| @@ -12,8 +12,7 @@ | |||
| 12 | <script type="text/montage-serialization"> | 12 | <script type="text/montage-serialization"> |
| 13 | { | 13 | { |
| 14 | "hottext1": { | 14 | "hottext1": { |
| 15 | "module": "js/components/hottextunit.reel", | 15 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
| 16 | "name": "HotTextUnit", | ||
| 17 | "properties": { | 16 | "properties": { |
| 18 | "element": {"#": "innerRadiusControl"}, | 17 | "element": {"#": "innerRadiusControl"}, |
| 19 | "minValue":0, | 18 | "minValue":0, |
| @@ -25,8 +24,7 @@ | |||
| 25 | }, | 24 | }, |
| 26 | 25 | ||
| 27 | "owner": { | 26 | "owner": { |
| 28 | "module": "js/components/tools-properties/oval-properties.reel", | 27 | "prototype": "js/components/tools-properties/oval-properties.reel", |
| 29 | "name": "OvalProperties", | ||
| 30 | "properties": { | 28 | "properties": { |
| 31 | "element": {"#": "ovalProperties"}, | 29 | "element": {"#": "ovalProperties"}, |
| 32 | "innerRadius": {"@": "hottext1"} | 30 | "innerRadius": {"@": "hottext1"} |
| @@ -37,9 +35,9 @@ | |||
| 37 | </head> | 35 | </head> |
| 38 | 36 | ||
| 39 | <body> | 37 | <body> |
| 40 | <div id="ovalProperties"> | 38 | <div data-montage-id="ovalProperties"> |
| 41 | <label class="label">Inner Radius:</label> | 39 | <label class="label">Inner Radius:</label> |
| 42 | <div id="innerRadiusControl" class="label"></div> | 40 | <div data-montage-id="innerRadiusControl" class="label"></div> |
| 43 | </div> | 41 | </div> |
| 44 | </body> | 42 | </body> |
| 45 | 43 | ||