diff options
author | Valerio Virgillito | 2012-04-26 17:09:12 -0700 |
---|---|---|
committer | Valerio Virgillito | 2012-04-26 17:09:12 -0700 |
commit | 7968f3a9cf56392c914d6bd44cc90145b6d807a3 (patch) | |
tree | b632e72735c9a071078121be07cf8cba2ebf29cc /js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html | |
parent | b03c3b087297f471840ab8595d5aa8bd0249a742 (diff) | |
parent | bcfb200482c26b2bfc0d6577b1eb0de7a19a6762 (diff) | |
download | ninja-7968f3a9cf56392c914d6bd44cc90145b6d807a3.tar.gz |
Merge branch 'master' of https://github.com/mayhewinator/ninja-internal into serialization
Diffstat (limited to 'js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html')
-rwxr-xr-x | js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html index 81facc49..010e77b2 100755 --- a/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-properties.html +++ b/js/components/tools-properties/ink-bottle-properties.reel/ink-bottle-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/> |
@@ -36,8 +36,7 @@ | |||
36 | }, | 36 | }, |
37 | 37 | ||
38 | "borderWidthHT": { | 38 | "borderWidthHT": { |
39 | "module": "js/components/hottextunit.reel", | 39 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
40 | "name": "HotTextUnit", | ||
41 | "properties": { | 40 | "properties": { |
42 | "element": {"#": "borderWidth"}, | 41 | "element": {"#": "borderWidth"}, |
43 | "minValue": 1, | 42 | "minValue": 1, |
@@ -96,8 +95,7 @@ | |||
96 | }, | 95 | }, |
97 | 96 | ||
98 | "strokeSizeHT": { | 97 | "strokeSizeHT": { |
99 | "module": "js/components/hottextunit.reel", | 98 | "prototype": "js/components/hottextunit.reel[HotTextUnit]", |
100 | "name": "HotTextUnit", | ||
101 | "properties": { | 99 | "properties": { |
102 | "element": {"#": "strokeSize"}, | 100 | "element": {"#": "strokeSize"}, |
103 | "minValue": 1, | 101 | "minValue": 1, |
@@ -125,8 +123,7 @@ | |||
125 | }, | 123 | }, |
126 | 124 | ||
127 | "_strokeMaterialCB": { | 125 | "_strokeMaterialCB": { |
128 | "module": "js/components/combobox.reel", | 126 | "prototype": "js/components/combobox.reel", |
129 | "name": "Combobox", | ||
130 | "properties": { | 127 | "properties": { |
131 | "element": {"#": "strokeMaterialIBCB"}, | 128 | "element": {"#": "strokeMaterialIBCB"}, |
132 | "labelField": "_name", | 129 | "labelField": "_name", |
@@ -135,8 +132,7 @@ | |||
135 | }, | 132 | }, |
136 | 133 | ||
137 | "owner": { | 134 | "owner": { |
138 | "module": "js/components/tools-properties/ink-bottle-properties.reel", | 135 | "prototype": "js/components/tools-properties/ink-bottle-properties.reel", |
139 | "name": "InkBottleProperties", | ||
140 | "properties": { | 136 | "properties": { |
141 | "element": {"#": "inkBottleProperties"}, | 137 | "element": {"#": "inkBottleProperties"}, |
142 | 138 | ||