diff options
author | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
---|---|---|
committer | Armen Kesablyan | 2012-06-19 01:03:59 -0700 |
commit | 2e13a73e4ee980a6f73f6ff48b2a195eb209a7db (patch) | |
tree | d352f5e769eae0e1b7b76ccbeafa9b174b1a9918 /js/components/tools-properties/text-properties.reel | |
parent | 244e608645778746d1a3b5aa0d4c0868f7c5c272 (diff) | |
parent | c59eb371559a3061ce53223e249ca97daace5968 (diff) | |
download | ninja-2e13a73e4ee980a6f73f6ff48b2a195eb209a7db.tar.gz |
Merge branch 'refs/heads/master' into binding
Conflicts:
js/components/layout/tools-list.reel/tools-list.html
js/components/layout/tools-properties.reel/tools-properties.html
js/document/document-html.js
js/document/templates/app/main.js
js/panels/Panel.reel/Panel.js
node_modules/montage/ui/native-control.js
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/components/tools-properties/text-properties.reel')
-rwxr-xr-x | js/components/tools-properties/text-properties.reel/text-properties.html | 18 | ||||
-rwxr-xr-x | js/components/tools-properties/text-properties.reel/text-properties.js | 44 |
2 files changed, 24 insertions, 38 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 a3477e99..a353752f 100755 --- a/js/components/tools-properties/text-properties.reel/text-properties.html +++ b/js/components/tools-properties/text-properties.reel/text-properties.html | |||
@@ -89,7 +89,6 @@ | |||
89 | "properties": { | 89 | "properties": { |
90 | "element": {"#": "btnBold"}, | 90 | "element": {"#": "btnBold"}, |
91 | "pressedClass": "active", | 91 | "pressedClass": "active", |
92 | "preventFocus": true, | ||
93 | "identifier": "btnBold", | 92 | "identifier": "btnBold", |
94 | "pressedLabel": "B", | 93 | "pressedLabel": "B", |
95 | "unpressedLabel": "B" | 94 | "unpressedLabel": "B" |
@@ -101,7 +100,6 @@ | |||
101 | "properties": { | 100 | "properties": { |
102 | "element": {"#": "btnItalic"}, | 101 | "element": {"#": "btnItalic"}, |
103 | "pressedClass": "active", | 102 | "pressedClass": "active", |
104 | "preventFocus": true, | ||
105 | "identifier": "btnItalic", | 103 | "identifier": "btnItalic", |
106 | "pressedLabel": "I", | 104 | "pressedLabel": "I", |
107 | "unpressedLabel": "I" | 105 | "unpressedLabel": "I" |
@@ -118,7 +116,6 @@ | |||
118 | "properties": { | 116 | "properties": { |
119 | "element": {"#": "btnUnderline"}, | 117 | "element": {"#": "btnUnderline"}, |
120 | "pressedClass": "active", | 118 | "pressedClass": "active", |
121 | "preventFocus": true, | ||
122 | "identifier": "btnUnderline", | 119 | "identifier": "btnUnderline", |
123 | "pressedLabel": "U", | 120 | "pressedLabel": "U", |
124 | "unpressedLabel": "U" | 121 | "unpressedLabel": "U" |
@@ -135,7 +132,6 @@ | |||
135 | "properties": { | 132 | "properties": { |
136 | "element": {"#": "btnStrikethrough"}, | 133 | "element": {"#": "btnStrikethrough"}, |
137 | "pressedClass": "active", | 134 | "pressedClass": "active", |
138 | "preventFocus": true, | ||
139 | "identifier": "btnStrikethrough", | 135 | "identifier": "btnStrikethrough", |
140 | "pressedLabel": "S", | 136 | "pressedLabel": "S", |
141 | "unpressedLabel": "S" | 137 | "unpressedLabel": "S" |
@@ -153,7 +149,6 @@ | |||
153 | "properties": { | 149 | "properties": { |
154 | "element": {"#": "alignLeft"}, | 150 | "element": {"#": "alignLeft"}, |
155 | "pressedClass": "active", | 151 | "pressedClass": "active", |
156 | "preventFocus": true, | ||
157 | "identifier": "alignLeft", | 152 | "identifier": "alignLeft", |
158 | "pressedLabel": "", | 153 | "pressedLabel": "", |
159 | "unpressedLabel": "" | 154 | "unpressedLabel": "" |
@@ -170,7 +165,6 @@ | |||
170 | "properties": { | 165 | "properties": { |
171 | "element": {"#": "alignCenter"}, | 166 | "element": {"#": "alignCenter"}, |
172 | "pressedClass": "active", | 167 | "pressedClass": "active", |
173 | "preventFocus": true, | ||
174 | "identifier": "alignCenter", | 168 | "identifier": "alignCenter", |
175 | "pressedLabel": "", | 169 | "pressedLabel": "", |
176 | "unpressedLabel": "" | 170 | "unpressedLabel": "" |
@@ -187,7 +181,6 @@ | |||
187 | "properties": { | 181 | "properties": { |
188 | "element": {"#": "alignRight"}, | 182 | "element": {"#": "alignRight"}, |
189 | "pressedClass": "active", | 183 | "pressedClass": "active", |
190 | "preventFocus": true, | ||
191 | "identifier": "alignRight", | 184 | "identifier": "alignRight", |
192 | "pressedLabel": "", | 185 | "pressedLabel": "", |
193 | "unpressedLabel": "" | 186 | "unpressedLabel": "" |
@@ -204,7 +197,6 @@ | |||
204 | "properties": { | 197 | "properties": { |
205 | "element": {"#": "alignJustify"}, | 198 | "element": {"#": "alignJustify"}, |
206 | "pressedClass": "active", | 199 | "pressedClass": "active", |
207 | "preventFocus": true, | ||
208 | "identifier": "alignJustify", | 200 | "identifier": "alignJustify", |
209 | "pressedLabel": "", | 201 | "pressedLabel": "", |
210 | "unpressedLabel": "" | 202 | "unpressedLabel": "" |
@@ -220,10 +212,8 @@ | |||
220 | "prototype": "montage/ui/button.reel", | 212 | "prototype": "montage/ui/button.reel", |
221 | "properties": { | 213 | "properties": { |
222 | "element": {"#": "indent"}, | 214 | "element": {"#": "indent"}, |
223 | "pressedClass": "active", | ||
224 | "preventFocus": true, | ||
225 | "identifier": "indent", | 215 | "identifier": "indent", |
226 | "label": ">>" | 216 | "value": ">>" |
227 | }, | 217 | }, |
228 | "listeners": [ | 218 | "listeners": [ |
229 | { | 219 | { |
@@ -236,10 +226,8 @@ | |||
236 | "prototype": "montage/ui/button.reel", | 226 | "prototype": "montage/ui/button.reel", |
237 | "properties": { | 227 | "properties": { |
238 | "element": {"#": "outdent"}, | 228 | "element": {"#": "outdent"}, |
239 | "pressedClass": "active", | ||
240 | "preventFocus": true, | ||
241 | "identifier": "outdent", | 229 | "identifier": "outdent", |
242 | "label": "<<" | 230 | "value": "<<" |
243 | }, | 231 | }, |
244 | "listeners": [ | 232 | "listeners": [ |
245 | { | 233 | { |
@@ -253,7 +241,6 @@ | |||
253 | "properties": { | 241 | "properties": { |
254 | "element": {"#": "bulletedList"}, | 242 | "element": {"#": "bulletedList"}, |
255 | "pressedClass": "active", | 243 | "pressedClass": "active", |
256 | "preventFocus": true, | ||
257 | "identifier": "bulletedList", | 244 | "identifier": "bulletedList", |
258 | "pressedLabel": "• • •", | 245 | "pressedLabel": "• • •", |
259 | "unpressedLabel": "• • •" | 246 | "unpressedLabel": "• • •" |
@@ -270,7 +257,6 @@ | |||
270 | "properties": { | 257 | "properties": { |
271 | "element": {"#": "numberedList"}, | 258 | "element": {"#": "numberedList"}, |
272 | "pressedClass": "active", | 259 | "pressedClass": "active", |
273 | "preventFocus": true, | ||
274 | "identifier": "numberedList", | 260 | "identifier": "numberedList", |
275 | "pressedLabel": "1 2 3", | 261 | "pressedLabel": "1 2 3", |
276 | "unpressedLabel": "1 2 3" | 262 | "unpressedLabel": "1 2 3" |
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.js b/js/components/tools-properties/text-properties.reel/text-properties.js index 35d46cc7..72a6f034 100755 --- a/js/components/tools-properties/text-properties.reel/text-properties.js +++ b/js/components/tools-properties/text-properties.reel/text-properties.js | |||
@@ -10,28 +10,28 @@ var ArrayController = require("montage/ui/controller/array-controller").ArrayCon | |||
10 | var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties; | 10 | var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties; |
11 | 11 | ||
12 | exports.TextProperties = Montage.create(ToolProperties, { | 12 | exports.TextProperties = Montage.create(ToolProperties, { |
13 | className: {value: null}, | 13 | className: {value: null, serializable: true}, |
14 | tagType: {value: null}, | 14 | tagType: {value: null, serializable: true}, |
15 | fontSelection: {value: null}, | 15 | fontSelection: {value: null, serializable: true}, |
16 | fontSettings: {value: null}, | 16 | fontSettings: {value: null, serializable: true}, |
17 | fontSize: {value: null}, | 17 | fontSize: {value: null, serializable: true}, |
18 | fontColor: {value: null}, | 18 | fontColor: {value: null, serializable: true}, |
19 | btnBold: {value: null}, | 19 | btnBold: {value: null, serializable: true}, |
20 | btnItalic: {value: null}, | 20 | btnItalic: {value: null, serializable: true}, |
21 | btnUnderline: {value: null}, | 21 | btnUnderline: {value: null, serializable: true}, |
22 | btnStrikethrough: {value: null}, | 22 | btnStrikethrough: {value: null, serializable: true}, |
23 | txtLink: {value: null}, | 23 | txtLink: {value: null, serializable: true}, |
24 | linkTarget: {value: null}, | 24 | linkTarget: {value: null, serializable: true}, |
25 | alignLeft: {value: null}, | 25 | alignLeft: {value: null, serializable: true}, |
26 | alignCenter: {value: null}, | 26 | alignCenter: {value: null, serializable: true}, |
27 | alignRight: {value: null}, | 27 | alignRight: {value: null, serializable: true}, |
28 | alignJustify: {value: null}, | 28 | alignJustify: {value: null, serializable: true}, |
29 | indent: {value: null}, | 29 | indent: {value: null, serializable: true}, |
30 | outdent: {value: null}, | 30 | outdent: {value: null, serializable: true}, |
31 | numberedList: {value: null}, | 31 | numberedList: {value: null, serializable: true}, |
32 | bulletedList: {value: null}, | 32 | bulletedList: {value: null, serializable: true}, |
33 | fontTypes: {value: null}, | 33 | fontTypes: {value: null, serializable: true}, |
34 | fontSizes: {value: null}, | 34 | fontSizes: {value: null, serializable: true}, |
35 | 35 |