aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/oval-properties.reel
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-04-27 14:29:01 -0700
committerJose Antonio Marquez2012-04-27 14:29:01 -0700
commit7fdeb9feac4d2da9f86646cda4548ea60e5effa9 (patch)
tree6b43b7b2375fad6804ae88287906e3b77b4539b9 /js/components/tools-properties/oval-properties.reel
parentd988dead643ff4f9bfa417286a6b5f88be0e7c82 (diff)
parentc8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff)
downloadninja-7fdeb9feac4d2da9f86646cda4548ea60e5effa9.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Document
Diffstat (limited to 'js/components/tools-properties/oval-properties.reel')
-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"}