diff options
author | Pushkar Joshi | 2012-04-27 15:05:38 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-04-27 15:05:38 -0700 |
commit | c8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc (patch) | |
tree | 74fcb9818a917d4f8ddb0db0c78a8cff9af86339 /js/components/tools-properties/rect-properties.reel | |
parent | 28d1594b868e3c08e5603adbd5b29df1e24d57e9 (diff) | |
parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
download | ninja-c8fc8e1bd1c394f433b4fc1677f4bc596e7cc2cc.tar.gz |
Merge branch 'master' into pentool
Diffstat (limited to 'js/components/tools-properties/rect-properties.reel')
-rwxr-xr-x | js/components/tools-properties/rect-properties.reel/rect-properties.html | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/js/components/tools-properties/rect-properties.reel/rect-properties.html b/js/components/tools-properties/rect-properties.reel/rect-properties.html index ceb761b9..47eff533 100755 --- a/js/components/tools-properties/rect-properties.reel/rect-properties.html +++ b/js/components/tools-properties/rect-properties.reel/rect-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": {"#": "TLRadiusControl"}, | 17 | "element": {"#": "TLRadiusControl"}, |
19 | "acceptableUnits" : ["px", "pt", "%"] | 18 | "acceptableUnits" : ["px", "pt", "%"] |
@@ -21,8 +20,7 @@ | |||
21 | }, | 20 | }, |
22 | 21 | ||
23 | "hottext2": { | 22 | "hottext2": { |
24 | "module": "js/components/hottextunit.reel", | 23 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
25 | "name": "HotTextUnit", | ||
26 | "properties": { | 24 | "properties": { |
27 | "element": {"#": "TRRadiusControl"}, | 25 | "element": {"#": "TRRadiusControl"}, |
28 | "acceptableUnits" : ["px", "pt", "%"], | 26 | "acceptableUnits" : ["px", "pt", "%"], |
@@ -31,8 +29,7 @@ | |||
31 | }, | 29 | }, |
32 | 30 | ||
33 | "hottext3": { | 31 | "hottext3": { |
34 | "module": "js/components/hottextunit.reel", | 32 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
35 | "name": "HotTextUnit", | ||
36 | "properties": { | 33 | "properties": { |
37 | "element": {"#": "BLRadiusControl"}, | 34 | "element": {"#": "BLRadiusControl"}, |
38 | "acceptableUnits" : ["px", "pt", "%"], | 35 | "acceptableUnits" : ["px", "pt", "%"], |
@@ -41,8 +38,7 @@ | |||
41 | }, | 38 | }, |
42 | 39 | ||
43 | "hottext4": { | 40 | "hottext4": { |
44 | "module": "js/components/hottextunit.reel", | 41 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
45 | "name": "HotTextUnit", | ||
46 | "properties": { | 42 | "properties": { |
47 | "element": {"#": "BRRadiusControl"}, | 43 | "element": {"#": "BRRadiusControl"}, |
48 | "acceptableUnits" : ["px", "pt", "%"], | 44 | "acceptableUnits" : ["px", "pt", "%"], |
@@ -62,8 +58,7 @@ | |||
62 | }, | 58 | }, |
63 | 59 | ||
64 | "owner": { | 60 | "owner": { |
65 | "module": "js/components/tools-properties/rect-properties.reel", | 61 | "prototype": "js/components/tools-properties/rect-properties.reel", |
66 | "name": "RectProperties", | ||
67 | "properties": { | 62 | "properties": { |
68 | "element": {"#": "rectProperties"}, | 63 | "element": {"#": "rectProperties"}, |
69 | "lockButton": {"@": "lockButton"}, | 64 | "lockButton": {"@": "lockButton"}, |