aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/pen-properties.reel
diff options
context:
space:
mode:
authorAnanya Sen2012-05-01 13:39:30 -0700
committerAnanya Sen2012-05-01 13:39:30 -0700
commitc360d1a5cfe894591ae65f892ead11d0ca537b18 (patch)
tree13964f810d3516dbc02e27ab5bb576fe62366f26 /js/components/tools-properties/pen-properties.reel
parent3137d919e6b4ccbb2fb68c5920f4376acde3f1f5 (diff)
parente3fa4c7db57b63c5ac604c9420062de5d0fe413a (diff)
downloadninja-c360d1a5cfe894591ae65f892ead11d0ca537b18.tar.gz
Merge branch 'refs/heads/ninja-internal-master' into Codeview-improvements
Diffstat (limited to 'js/components/tools-properties/pen-properties.reel')
-rwxr-xr-xjs/components/tools-properties/pen-properties.reel/pen-properties.html8
1 files changed, 3 insertions, 5 deletions
diff --git a/js/components/tools-properties/pen-properties.reel/pen-properties.html b/js/components/tools-properties/pen-properties.reel/pen-properties.html
index acbedcac..e835f69d 100755
--- a/js/components/tools-properties/pen-properties.reel/pen-properties.html
+++ b/js/components/tools-properties/pen-properties.reel/pen-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/>
@@ -13,8 +13,7 @@
13 { 13 {
14 14
15 "strokeSizeHT": { 15 "strokeSizeHT": {
16 "module": "js/components/hottextunit.reel", 16 "prototype": "js/components/hottextunit.reel[HotTextUnit]",
17 "name": "HotTextUnit",
18 "properties": { 17 "properties": {
19 "element": {"#": "strokeSize"}, 18 "element": {"#": "strokeSize"},
20 "minValue": 1, 19 "minValue": 1,
@@ -26,8 +25,7 @@
26 }, 25 },
27 26
28 "owner": { 27 "owner": {
29 "module": "js/components/tools-properties/pen-properties.reel", 28 "prototype": "js/components/tools-properties/pen-properties.reel",
30 "name": "PenProperties",
31 "properties": { 29 "properties": {
32 "element": {"#": "penProperties"}, 30 "element": {"#": "penProperties"},
33 "_strokeSize": {"@": "strokeSizeHT"} 31 "_strokeSize": {"@": "strokeSizeHT"}