aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/brush-properties.reel/brush-properties.html
diff options
context:
space:
mode:
authorEric Guzman2012-04-30 13:48:43 -0700
committerEric Guzman2012-04-30 13:48:43 -0700
commit23d8efd4ed9e8fd43f516595009679fb44c8096d (patch)
tree7d5be06e6417102702a49ece24fca82528aced7a /js/components/tools-properties/brush-properties.reel/brush-properties.html
parentae94b22c27b9b155e94bf140631e7faf8f55c6c0 (diff)
parentc8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff)
downloadninja-23d8efd4ed9e8fd43f516595009679fb44c8096d.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/components/tools-properties/brush-properties.reel/brush-properties.html')
-rwxr-xr-xjs/components/tools-properties/brush-properties.reel/brush-properties.html17
1 files changed, 6 insertions, 11 deletions
diff --git a/js/components/tools-properties/brush-properties.reel/brush-properties.html b/js/components/tools-properties/brush-properties.reel/brush-properties.html
index d9c35dc2..b0c02734 100755
--- a/js/components/tools-properties/brush-properties.reel/brush-properties.html
+++ b/js/components/tools-properties/brush-properties.reel/brush-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 "strokeSizeHT": { 14 "strokeSizeHT": {
15 "module": "js/components/hottextunit.reel", 15 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
16 "name": "HotTextUnit",
17 "properties": { 16 "properties": {
18 "element": {"#": "strokeSize"}, 17 "element": {"#": "strokeSize"},
19 "minValue": 1, 18 "minValue": 1,
@@ -25,8 +24,7 @@
25 }, 24 },
26 25
27 "strokeHardnessHT": { 26 "strokeHardnessHT": {
28 "module": "js/components/hottextunit.reel", 27 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
29 "name": "HotTextUnit",
30 "properties": { 28 "properties": {
31 "element": {"#": "strokeHardness"}, 29 "element": {"#": "strokeHardness"},
32 "minValue": 0, 30 "minValue": 0,
@@ -39,8 +37,7 @@
39 }, 37 },
40 38
41 "strokeAngleHT": { 39 "strokeAngleHT": {
42 "module": "js/components/hottextunit.reel", 40 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
43 "name": "HotTextUnit",
44 "properties": { 41 "properties": {
45 "element": {"#": "strokeAngle"}, 42 "element": {"#": "strokeAngle"},
46 "minValue": -90, 43 "minValue": -90,
@@ -53,8 +50,7 @@
53 }, 50 },
54 51
55 "smoothingAmountHT": { 52 "smoothingAmountHT": {
56 "module": "js/components/hottext.reel", 53 "prototype": "js/components/hottext.reel[HotText]",
57 "name": "HotText",
58 "properties": { 54 "properties": {
59 "element": {"#": "smoothingAmount"}, 55 "element": {"#": "smoothingAmount"},
60 "minValue": 0, 56 "minValue": 0,
@@ -65,8 +61,7 @@
65 }, 61 },
66 62
67 "owner": { 63 "owner": {
68 "module": "js/components/tools-properties/brush-properties.reel", 64 "prototype": "js/components/tools-properties/brush-properties.reel",
69 "name": "BrushProperties",
70 "properties": { 65 "properties": {
71 "element": {"#": "brushProperties"}, 66 "element": {"#": "brushProperties"},
72 "_strokeSize": {"@": "strokeSizeHT"}, 67 "_strokeSize": {"@": "strokeSizeHT"},