aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties
diff options
context:
space:
mode:
authorAnanya Sen2012-02-17 14:26:56 -0800
committerAnanya Sen2012-02-17 14:26:56 -0800
commit2980816130a44cd478b2a9d6606e021efbcebd4a (patch)
tree762d98ba8852b858c03760f4b9bef294fae6486c /js/components/tools-properties
parent96178309ddcdb54c0c451b69ea6fb8cdf76fcf62 (diff)
parenta42c536c2b3209afc058eabd31167bd0aa6f71c8 (diff)
downloadninja-2980816130a44cd478b2a9d6606e021efbcebd4a.tar.gz
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts: css/ninja.css js/controllers/document-controller.js Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/components/tools-properties')
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.css4
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html38
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.js116
3 files changed, 123 insertions, 35 deletions
diff --git a/js/components/tools-properties/text-properties.reel/text-properties.css b/js/components/tools-properties/text-properties.reel/text-properties.css
index 6aa61812..f7bb8295 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.css
+++ b/js/components/tools-properties/text-properties.reel/text-properties.css
@@ -12,6 +12,10 @@
12 padding: 0px 8px; 12 padding: 0px 8px;
13} 13}
14 14
15.optionsTextTool select {
16 margin: 2px;
17}
18
15.optionsTextTool > *, .optionsTextTool .btnGroup > * { 19.optionsTextTool > *, .optionsTextTool .btnGroup > * {
16 float:left; 20 float:left;
17} 21}
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 7ded1236..13a88ba7 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.html
+++ b/js/components/tools-properties/text-properties.reel/text-properties.html
@@ -100,7 +100,8 @@
100 "pressedClass": "active", 100 "pressedClass": "active",
101 "preventFocus": true, 101 "preventFocus": true,
102 "identifier": "btnBold", 102 "identifier": "btnBold",
103 "label": "B" 103 "pressedLabel": "B",
104 "unpressedLabel": "B"
104 }, 105 },
105 "listeners": [ 106 "listeners": [
106 { 107 {
@@ -117,7 +118,8 @@
117 "pressedClass": "active", 118 "pressedClass": "active",
118 "preventFocus": true, 119 "preventFocus": true,
119 "identifier": "btnItalic", 120 "identifier": "btnItalic",
120 "label": "I" 121 "pressedLabel": "I",
122 "unpressedLabel": "I"
121 }, 123 },
122 "listeners": [ 124 "listeners": [
123 { 125 {
@@ -134,7 +136,8 @@
134 "pressedClass": "active", 136 "pressedClass": "active",
135 "preventFocus": true, 137 "preventFocus": true,
136 "identifier": "btnUnderline", 138 "identifier": "btnUnderline",
137 "label": "U" 139 "pressedLabel": "U",
140 "unpressedLabel": "U"
138 }, 141 },
139 "listeners": [ 142 "listeners": [
140 { 143 {
@@ -151,7 +154,8 @@
151 "pressedClass": "active", 154 "pressedClass": "active",
152 "preventFocus": true, 155 "preventFocus": true,
153 "identifier": "btnStrikethrough", 156 "identifier": "btnStrikethrough",
154 "label": "S" 157 "pressedLabel": "S",
158 "unpressedLabel": "S"
155 }, 159 },
156 "listeners": [ 160 "listeners": [
157 { 161 {
@@ -169,7 +173,8 @@
169 "pressedClass": "active", 173 "pressedClass": "active",
170 "preventFocus": true, 174 "preventFocus": true,
171 "identifier": "alignLeft", 175 "identifier": "alignLeft",
172 "label": "Left" 176 "pressedLabel": "Left",
177 "unpressedLabel": "Left"
173 }, 178 },
174 "listeners": [ 179 "listeners": [
175 { 180 {
@@ -186,7 +191,8 @@
186 "pressedClass": "active", 191 "pressedClass": "active",
187 "preventFocus": true, 192 "preventFocus": true,
188 "identifier": "alignCenter", 193 "identifier": "alignCenter",
189 "label": "Center" 194 "pressedLabel": "Center",
195 "unpressedLabel": "Center"
190 }, 196 },
191 "listeners": [ 197 "listeners": [
192 { 198 {
@@ -203,7 +209,8 @@
203 "pressedClass": "active", 209 "pressedClass": "active",
204 "preventFocus": true, 210 "preventFocus": true,
205 "identifier": "alignRight", 211 "identifier": "alignRight",
206 "label": "Right" 212 "pressedLabel": "Right",
213 "unpressedLabel": "Right"
207 }, 214 },
208 "listeners": [ 215 "listeners": [
209 { 216 {
@@ -220,7 +227,8 @@
220 "pressedClass": "active", 227 "pressedClass": "active",
221 "preventFocus": true, 228 "preventFocus": true,
222 "identifier": "alignJustify", 229 "identifier": "alignJustify",
223 "label": "Justify" 230 "pressedLabel": "Justify",
231 "unpressedLabel": "Justify"
224 }, 232 },
225 "listeners": [ 233 "listeners": [
226 { 234 {
@@ -236,7 +244,7 @@
236 "element": {"#": "indent"}, 244 "element": {"#": "indent"},
237 "pressedClass": "active", 245 "pressedClass": "active",
238 "preventFocus": true, 246 "preventFocus": true,
239 "identifier": "outdent", 247 "identifier": "indent",
240 "label": ">>" 248 "label": ">>"
241 }, 249 },
242 "listeners": [ 250 "listeners": [
@@ -253,7 +261,7 @@
253 "element": {"#": "outdent"}, 261 "element": {"#": "outdent"},
254 "pressedClass": "active", 262 "pressedClass": "active",
255 "preventFocus": true, 263 "preventFocus": true,
256 "identifier": "<<", 264 "identifier": "outdent",
257 "label": "<<" 265 "label": "<<"
258 }, 266 },
259 "listeners": [ 267 "listeners": [
@@ -271,7 +279,8 @@
271 "pressedClass": "active", 279 "pressedClass": "active",
272 "preventFocus": true, 280 "preventFocus": true,
273 "identifier": "bulletedList", 281 "identifier": "bulletedList",
274 "label": "• • •" 282 "pressedLabel": "• • •",
283 "unpressedLabel": "• • •"
275 }, 284 },
276 "listeners": [ 285 "listeners": [
277 { 286 {
@@ -288,7 +297,8 @@
288 "pressedClass": "active", 297 "pressedClass": "active",
289 "preventFocus": true, 298 "preventFocus": true,
290 "identifier": "numberedList", 299 "identifier": "numberedList",
291 "label": "1 2 3" 300 "pressedLabel": "1 2 3",
301 "unpressedLabel": "1 2 3"
292 }, 302 },
293 "listeners": [ 303 "listeners": [
294 { 304 {
@@ -310,10 +320,10 @@
310 <label class="label" style="display: none">Tag:</label> 320 <label class="label" style="display: none">Tag:</label>
311 <select id="tagType" style="display: none"></select> 321 <select id="tagType" style="display: none"></select>
312 <label class="label">Font:</label> 322 <label class="label">Font:</label>
313 <select id="fontSelection" class="fontSelection"></select> 323 <select id="fontSelection" class="nj-skinned fontSelection"></select>
314 <button id="fontSettings" style="display: none"></button> 324 <button id="fontSettings" style="display: none"></button>
315 <label class="label">Size:</label> 325 <label class="label">Size:</label>
316 <input id="fontSize"/> 326 <select id="fontSize" class="nj-skinned"></select>
317 <div class="fontColor"></div> 327 <div class="fontColor"></div>
318 <div class="btnGroup"> 328 <div class="btnGroup">
319 <button id="btnBold" class="btnBold nj-skinned" style="font-weight:bold"></button> 329 <button id="btnBold" class="btnBold nj-skinned" style="font-weight:bold"></button>
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 55274322..88d38ffe 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.js
+++ b/js/components/tools-properties/text-properties.reel/text-properties.js
@@ -6,6 +6,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
6 6
7var Montage = require("montage/core/core").Montage; 7var Montage = require("montage/core/core").Montage;
8var Component = require("montage/ui/component").Component; 8var Component = require("montage/ui/component").Component;
9var ArrayController = require("montage/ui/controller/array-controller").ArrayController;