diff options
author | Ananya Sen | 2012-05-01 13:39:30 -0700 |
---|---|---|
committer | Ananya Sen | 2012-05-01 13:39:30 -0700 |
commit | c360d1a5cfe894591ae65f892ead11d0ca537b18 (patch) | |
tree | 13964f810d3516dbc02e27ab5bb576fe62366f26 /js/components/tools-properties/oval-properties.reel | |
parent | 3137d919e6b4ccbb2fb68c5920f4376acde3f1f5 (diff) | |
parent | e3fa4c7db57b63c5ac604c9420062de5d0fe413a (diff) | |
download | ninja-c360d1a5cfe894591ae65f892ead11d0ca537b18.tar.gz |
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
Diffstat (limited to 'js/components/tools-properties/oval-properties.reel')
-rwxr-xr-x | js/components/tools-properties/oval-properties.reel/oval-properties.html | 8 |
1 files changed, 3 insertions, 5 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..e460f7ea 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"} |