aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/oval-properties.reel/oval-properties.html
diff options
context:
space:
mode:
authorValerio Virgillito2012-04-26 17:09:12 -0700
committerValerio Virgillito2012-04-26 17:09:12 -0700
commit7968f3a9cf56392c914d6bd44cc90145b6d807a3 (patch)
treeb632e72735c9a071078121be07cf8cba2ebf29cc /js/components/tools-properties/oval-properties.reel/oval-properties.html
parentb03c3b087297f471840ab8595d5aa8bd0249a742 (diff)
parentbcfb200482c26b2bfc0d6577b1eb0de7a19a6762 (diff)
downloadninja-7968f3a9cf56392c914d6bd44cc90145b6d807a3.tar.gz
Merge branch 'master' of https://github.com/mayhewinator/ninja-internal into serialization
Diffstat (limited to 'js/components/tools-properties/oval-properties.reel/oval-properties.html')
-rwxr-xr-xjs/components/tools-properties/oval-properties.reel/oval-properties.html8
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"}