diff options
author | Eric Guzman | 2012-04-30 13:48:43 -0700 |
---|---|---|
committer | Eric Guzman | 2012-04-30 13:48:43 -0700 |
commit | 23d8efd4ed9e8fd43f516595009679fb44c8096d (patch) | |
tree | 7d5be06e6417102702a49ece24fca82528aced7a /js/components/tools-properties/text-properties.reel/text-properties.html | |
parent | ae94b22c27b9b155e94bf140631e7faf8f55c6c0 (diff) | |
parent | c8fac64d4ad8ac18744a17a5e0f0d17204355fd6 (diff) | |
download | ninja-23d8efd4ed9e8fd43f516595009679fb44c8096d.tar.gz |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Diffstat (limited to 'js/components/tools-properties/text-properties.reel/text-properties.html')
-rwxr-xr-x | js/components/tools-properties/text-properties.reel/text-properties.html | 56 |
1 files changed, 19 insertions, 37 deletions
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.html b/js/components/tools-properties/text-properties.reel/text-properties.html index 2d50a79e..03786d76 100755 --- a/js/components/tools-properties/text-properties.reel/text-properties.html +++ b/js/components/tools-properties/text-properties.reel/text-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 | "owner": { | 15 | "owner": { |
16 | "module": "js/components/tools-properties/text-properties.reel", | 16 | "prototype": "js/components/tools-properties/text-properties.reel", |
17 | "name": "TextProperties", | ||
18 | "properties": { | 17 | "properties": { |
19 | "element": {"#": "textProperties"}, | 18 | "element": {"#": "textProperties"}, |
20 | "className": {"@": "className"}, | 19 | "className": {"@": "className"}, |
@@ -40,22 +39,19 @@ | |||
40 | } | 39 | } |
41 | }, | 40 | }, |
42 | "className": { | 41 | "className": { |
43 | "module": "js/components/textfield.reel", | 42 | "prototype": "js/components/textfield.reel[TextField]", |
44 | "name": "TextField", | ||
45 | "properties": { | 43 | "properties": { |
46 | "element": {"#": "className"} | 44 | "element": {"#": "className"} |
47 | } | 45 | } |
48 | }, | 46 | }, |
49 | "tagType": { | 47 | "tagType": { |
50 | "module": "js/components/combobox.reel", | 48 | "prototype": "js/components/combobox.reel", |
51 | "name": "Combobox", | ||
52 | "properties": { | 49 | "properties": { |
53 | "element": {"#": "tagType"} | 50 | "element": {"#": "tagType"} |
54 | } | 51 | } |
55 | }, | 52 | }, |
56 | "fontSelection": { | 53 | "fontSelection": { |
57 | "module": "js/components/combobox.reel", | 54 | "prototype": "js/components/combobox.reel", |
58 | "name": "Combobox", | ||
59 | "properties": { | 55 | "properties": { |
60 | "element": {"#": "fontSelection"}, | 56 | "element": {"#": "fontSelection"}, |
61 | "identifier": "fontSelection" | 57 | "identifier": "fontSelection" |
@@ -69,16 +65,14 @@ | |||
69 | 65 | ||
70 | }, | 66 | }, |
71 | "fontSettings": { | 67 | "fontSettings": { |
72 | "module": "montage/ui/button.reel", | 68 | "prototype": "montage/ui/button.reel", |
73 | "name": "Button", | ||
74 | "properties": { | 69 | "properties": { |
75 | "element": {"#": "fontSettings"} | 70 | "element": {"#": "fontSettings"} |
76 | } | 71 | } |
77 | }, | 72 | }, |
78 | 73 | ||
79 | "fontSize": { | 74 | "fontSize": { |
80 | "module": "js/components/combobox.reel", | 75 | "prototype": "js/components/combobox.reel", |
81 | "name": "Combobox", | ||
82 | "properties": { | 76 | "properties": { |
83 | "element": {"#": "fontSize"}, | 77 | "element": {"#": "fontSize"}, |
84 | "identifier": "fontSize" | 78 | "identifier": "fontSize" |
@@ -93,8 +87,7 @@ | |||
93 | }, | 87 | }, |
94 | 88 | ||
95 | "btnBold": { | 89 | "btnBold": { |
96 | "module": "montage/ui/toggle-button.reel", | 90 | "prototype": "montage/ui/toggle-button.reel", |
97 | "name": "ToggleButton", | ||
98 | "properties": { | 91 | "properties": { |
99 | "element": {"#": "btnBold"}, | 92 | "element": {"#": "btnBold"}, |
100 | "pressedClass": "active", | 93 | "pressedClass": "active", |
@@ -111,8 +104,7 @@ | |||
111 | ] | 104 | ] |
112 | }, | 105 | }, |
113 | "btnItalic": { | 106 | "btnItalic": { |
114 | "module": "montage/ui/toggle-button.reel", | 107 | "prototype": "montage/ui/toggle-button.reel", |
115 | "name": "ToggleButton", | ||
116 | "properties": { | 108 | "properties": { |
117 | "element": {"#": "btnItalic"}, | 109 | "element": {"#": "btnItalic"}, |
118 | "pressedClass": "active", | 110 | "pressedClass": "active", |
@@ -129,8 +121,7 @@ | |||
129 | ] | 121 | ] |
130 | }, | 122 | }, |
131 | "btnUnderline": { | 123 | "btnUnderline": { |
132 | "module": "montage/ui/toggle-button.reel", | 124 | "prototype": "montage/ui/toggle-button.reel", |
133 | "name": "ToggleButton", | ||
134 | "properties": { | 125 | "properties": { |
135 | "element": {"#": "btnUnderline"}, | 126 | "element": {"#": "btnUnderline"}, |
136 | "pressedClass": "active", | 127 | "pressedClass": "active", |
@@ -147,8 +138,7 @@ | |||
147 | ] | 138 | ] |
148 | }, | 139 | }, |
149 | "btnStrikethrough": { | 140 | "btnStrikethrough": { |
150 | "module": "montage/ui/toggle-button.reel", | 141 | "prototype": "montage/ui/toggle-button.reel", |
151 | "name": "ToggleButton", | ||
152 | "properties": { | 142 | "properties": { |
153 | "element": {"#": "btnStrikethrough"}, | 143 | "element": {"#": "btnStrikethrough"}, |
154 | "pressedClass": "active", | 144 | "pressedClass": "active", |
@@ -166,8 +156,7 @@ | |||
166 | }, | 156 | }, |
167 | 157 | ||
168 | "alignLeft": { | 158 | "alignLeft": { |
169 | "module": "montage/ui/toggle-button.reel", | 159 | "prototype": "montage/ui/toggle-button.reel", |
170 | "name": "ToggleButton", | ||
171 | "properties": { | 160 | "properties": { |
172 | "element": {"#": "alignLeft"}, | 161 | "element": {"#": "alignLeft"}, |
173 | "pressedClass": "active", | 162 | "pressedClass": "active", |
@@ -184,8 +173,7 @@ | |||
184 | ] | 173 | ] |
185 | }, | 174 | }, |
186 | "alignCenter": { | 175 | "alignCenter": { |
187 | "module": "montage/ui/toggle-button.reel", | 176 | "prototype": "montage/ui/toggle-button.reel", |
188 | "name": "ToggleButton", | ||
189 | "properties": { | 177 | "properties": { |
190 | "element": {"#": "alignCenter"}, | 178 | "element": {"#": "alignCenter"}, |
191 | "pressedClass": "active", | 179 | "pressedClass": "active", |
@@ -202,8 +190,7 @@ | |||
202 | ] | 190 | ] |
203 | }, | 191 | }, |
204 | "alignRight": { | 192 | "alignRight": { |
205 | "module": "montage/ui/toggle-button.reel", | 193 | "prototype": "montage/ui/toggle-button.reel", |
206 | "name": "ToggleButton", | ||
207 | "properties": { | 194 | "properties": { |
208 | "element": {"#": "alignRight"}, | 195 | "element": {"#": "alignRight"}, |
209 | "pressedClass": "active", | 196 | "pressedClass": "active", |
@@ -220,8 +207,7 @@ | |||
220 | ] | 207 | ] |
221 | }, | 208 | }, |
222 | "alignJustify": { | 209 | "alignJustify": { |
223 | "module": "montage/ui/toggle-button.reel", | 210 | "prototype": "montage/ui/toggle-button.reel", |
224 | "name": "ToggleButton", | ||
225 | "properties": { | 211 | "properties": { |
226 | "element": {"#": "alignJustify"}, | 212 | "element": {"#": "alignJustify"}, |
227 | "pressedClass": "active", | 213 | "pressedClass": "active", |
@@ -238,8 +224,7 @@ | |||
238 | ] | 224 | ] |
239 | }, | 225 | }, |
240 | "indent": { | 226 | "indent": { |
241 | "module": "montage/ui/button.reel", | 227 | "prototype": "montage/ui/button.reel", |
242 | "name": "Button", | ||
243 | "properties": { | 228 | "properties": { |
244 | "element": {"#": "indent"}, | 229 | "element": {"#": "indent"}, |
245 | "pressedClass": "active", | 230 | "pressedClass": "active", |
@@ -255,8 +240,7 @@ | |||
255 | ] | 240 |