aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/text-properties.reel
diff options
context:
space:
mode:
authorJon Reid2012-06-15 10:10:41 -0700
committerJon Reid2012-06-15 10:10:41 -0700
commit526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch)
tree65939e59615aaa10a7db77211e71616ad531bd0e /js/components/tools-properties/text-properties.reel
parentb5b760ee82e5cc4da176914983a6002cbf86c11a (diff)
parent5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff)
downloadninja-526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7.tar.gz
Merge remote-tracking branch 'ninja-internal/master' into test-merge
Conflicts: js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
Diffstat (limited to 'js/components/tools-properties/text-properties.reel')
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html18
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.js44
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 725e1d22..e7fafd0d 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"
@@ -106,7 +105,6 @@
106 "properties": { 105 "properties": {
107 "element": {"#": "btnItalic"}, 106 "element": {"#": "btnItalic"},
108 "pressedClass": "active", 107 "pressedClass": "active",
109 "preventFocus": true,
110 "identifier": "btnItalic", 108 "identifier": "btnItalic",
111 "pressedLabel": "I", 109 "pressedLabel": "I",
112 "unpressedLabel": "I" 110 "unpressedLabel": "I"
@@ -123,7 +121,6 @@
123 "properties": { 121 "properties": {
124 "element": {"#": "btnUnderline"}, 122 "element": {"#": "btnUnderline"},
125 "pressedClass": "active", 123 "pressedClass": "active",
126 "preventFocus": true,
127 "identifier": "btnUnderline", 124 "identifier": "btnUnderline",
128 "pressedLabel": "U", 125 "pressedLabel": "U",
129 "unpressedLabel": "U" 126 "unpressedLabel": "U"
@@ -140,7 +137,6 @@
140 "properties": { 137 "properties": {
141 "element": {"#": "btnStrikethrough"}, 138 "element": {"#": "btnStrikethrough"},
142 "pressedClass": "active", 139 "pressedClass": "active",
143 "preventFocus": true,
144 "identifier": "btnStrikethrough", 140 "identifier": "btnStrikethrough",
145 "pressedLabel": "S", 141 "pressedLabel": "S",
146 "unpressedLabel": "S" 142 "unpressedLabel": "S"
@@ -158,7 +154,6 @@
158 "properties": { 154 "properties": {
159 "element": {"#": "alignLeft"}, 155 "element": {"#": "alignLeft"},
160 "pressedClass": "active", 156 "pressedClass": "active",
161 "preventFocus": true,
162 "identifier": "alignLeft", 157 "identifier": "alignLeft",
163 "pressedLabel": "", 158 "pressedLabel": "",
164 "unpressedLabel": "" 159 "unpressedLabel": ""
@@ -175,7 +170,6 @@
175 "properties": { 170 "properties": {
176 "element": {"#": "alignCenter"}, 171 "element": {"#": "alignCenter"},
177 "pressedClass": "active", 172 "pressedClass": "active",
178 "preventFocus": true,
179 "identifier": "alignCenter", 173 "identifier": "alignCenter",
180 "pressedLabel": "", 174 "pressedLabel": "",
181 "unpressedLabel": "" 175 "unpressedLabel": ""
@@ -192,7 +186,6 @@
192 "properties": { 186 "properties": {
193 "element": {"#": "alignRight"}, 187 "element": {"#": "alignRight"},
194 "pressedClass": "active", 188 "pressedClass": "active",
195 "preventFocus": true,
196 "identifier": "alignRight", 189 "identifier": "alignRight",
197 "pressedLabel": "", 190 "pressedLabel": "",
198 "unpressedLabel": "" 191 "unpressedLabel": ""
@@ -209,7 +202,6 @@
209 "properties": { 202 "properties": {
210 "element": {"#": "alignJustify"}, 203 "element": {"#": "alignJustify"},
211 "pressedClass": "active", 204 "pressedClass": "active",
212 "preventFocus": true,
213 "identifier": "alignJustify", 205 "identifier": "alignJustify",
214 "pressedLabel": "", 206 "pressedLabel": "",
215 "unpressedLabel": "" 207 "unpressedLabel": ""
@@ -225,10 +217,8 @@
225 "prototype": "montage/ui/button.reel", 217 "prototype": "montage/ui/button.reel",
226 "properties": { 218 "properties": {
227 "element": {"#": "indent"}, 219 "element": {"#": "indent"},
228 "pressedClass": "active",
229 "preventFocus": true,
230 "identifier": "indent", 220 "identifier": "indent",
231 "label": ">>" 221 "value": ">>"
232 }, 222 },
233 "listeners": [ 223 "listeners": [
234 { 224 {
@@ -241,10 +231,8 @@
241 "prototype": "montage/ui/button.reel", 231 "prototype": "montage/ui/button.reel",
242 "properties": { 232 "properties": {
243 "element": {"#": "outdent"}, 233 "element": {"#": "outdent"},
244 "pressedClass": "active",
245 "preventFocus": true,
246 "identifier": "outdent", 234 "identifier": "outdent",
247 "label": "<<" 235 "value": "<<"
248 }, 236 },
249 "listeners": [ 237 "listeners": [
250 { 238 {
@@ -258,7 +246,6 @@
258 "properties": { 246 "properties": {
259 "element": {"#": "bulletedList"}, 247 "element": {"#": "bulletedList"},
260 "pressedClass": "active", 248 "pressedClass": "active",
261 "preventFocus": true,
262 "identifier": "bulletedList", 249 "identifier": "bulletedList",
263 "pressedLabel": "• • •", 250 "pressedLabel": "• • •",
264 "unpressedLabel": "• • •" 251 "unpressedLabel": "• • •"
@@ -275,7 +262,6 @@
275 "properties": { 262 "properties": {
276 "element": {"#": "numberedList"}, 263 "element": {"#": "numberedList"},
277 "pressedClass": "active", 264 "pressedClass": "active",
278 "preventFocus": true,
279 "identifier": "numberedList", 265 "identifier": "numberedList",
280 "pressedLabel": "1 2 3", 266 "pressedLabel": "1 2 3",
281 "unpressedLabel": "1 2 3" 267 "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 fa2ec066..7fe5537c 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
10var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties; 10var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties;
11 11
12exports.TextProperties = Montage.create(ToolProperties, { 12exports.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