aboutsummaryrefslogtreecommitdiff
path: root/js/components
diff options
context:
space:
mode:
Diffstat (limited to 'js/components')
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.html73
-rwxr-xr-xjs/components/tools-properties/text-properties.reel/text-properties.js128
2 files changed, 108 insertions, 93 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 6a94cf0a..e0edfdd6 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.html
+++ b/js/components/tools-properties/text-properties.reel/text-properties.html
@@ -139,31 +139,28 @@
139 "properties": { 139 "properties": {
140 "element": {"#": "alignLeft"}, 140 "element": {"#": "alignLeft"},
141 "pressedClass": "active", 141 "pressedClass": "active",
142 "identifier": "alignLeft", 142 "identifier": "justifyLeft",
143 "pressedLabel": "", 143 "pressedLabel": "",
144 "unpressedLabel": "" 144 "unpressedLabel": "",
145 "pressed": false
145 }, 146 },
146 "listeners": [ 147 "listeners": [
147 { 148 { "type": "action", "listener": {"@": "owner"} }
148 "type": "action",
149 "listener": {"@": "owner"}
150 }
151 ] 149 ]
152 }, 150 },
151
153 "alignCenter": { 152 "alignCenter": {
154 "prototype": "montage/ui/toggle-button.reel", 153 "prototype": "montage/ui/toggle-button.reel",
155 "properties": { 154 "properties": {
156 "element": {"#": "alignCenter"}, 155 "element": {"#": "alignCenter"},
157 "pressedClass": "active", 156 "pressedClass": "active",
158 "identifier": "alignCenter", 157 "identifier": "justifyCenter",
159 "pressedLabel": "", 158 "pressedLabel": "",
160 "unpressedLabel": "" 159 "unpressedLabel": "",
160 "pressed": false
161 }, 161 },
162 "listeners": [ 162 "listeners": [
163 { 163 { "type": "action", "listener": {"@": "owner"} }
164 "type": "action",
165 "listener": {"@": "owner"}
166 }
167 ] 164 ]
168 }, 165 },
169 "alignRight": { 166 "alignRight": {
@@ -171,15 +168,13 @@
171 "properties": { 168 "properties": {
172 "element": {"#": "alignRight"}, 169 "element": {"#": "alignRight"},
173 "pressedClass": "active", 170 "pressedClass": "active",
174 "identifier": "alignRight", 171 "identifier": "justifyRight",
175 "pressedLabel": "", 172 "pressedLabel": "",
176 "unpressedLabel": "" 173 "unpressedLabel": "",
174 "pressed": false
177 }, 175 },
178 "listeners": [ 176 "listeners": [
179 { 177 { "type": "action", "listener": {"@": "owner"} }
180 "type": "action",
181 "listener": {"@": "owner"}
182 }
183 ] 178 ]
184 }, 179 },
185 "alignJustify": { 180 "alignJustify": {
@@ -187,43 +182,33 @@
187 "properties": { 182 "properties": {
188 "element": {"#": "alignJustify"}, 183 "element": {"#": "alignJustify"},
189 "pressedClass": "active", 184 "pressedClass": "active",
190 "identifier": "alignJustify", 185 "identifier": "justify",
191 "pressedLabel": "", 186 "pressedLabel": "",
192 "unpressedLabel": "" 187 "unpressedLabel": "",
188 "pressed": false
193 }, 189 },
194 "listeners": [ 190 "listeners": [
195 { 191 { "type": "action", "listener": {"@": "owner"} }
196 "type": "action",
197 "listener": {"@": "owner"}
198 }
199 ] 192 ]
200 }, 193 },
201 "indent": { 194 "indent": {
202 "prototype": "montage/ui/button.reel", 195 "prototype": "montage/ui/button.reel",
203 "properties": { 196 "properties": {
204 "element": {"#": "indent"}, 197 "element": {"#": "indent"},
205 "identifier": "indent", 198 "identifier": "indent"
206 "value": ">>"
207 }, 199 },
208 "listeners": [ 200 "listeners": [
209 { 201 { "type": "action", "listener": {"@": "owner"} }
210 "type": "action",
211 "listener": {"@": "owner"}
212 }
213 ] 202 ]
214 }, 203 },
215 "outdent": { 204 "outdent": {
216 "prototype": "montage/ui/button.reel", 205 "prototype": "montage/ui/button.reel",
217 "properties": { 206 "properties": {
218 "element": {"#": "outdent"}, 207 "element": {"#": "outdent"},
219 "identifier": "outdent", 208 "identifier": "outdent"
220 "value": "<<"
221 }, 209 },
222 "listeners": [ 210 "listeners": [
223 { 211 { "type": "action", "listener": {"@": "owner"} }
224 "type": "action",
225 "listener": {"@": "owner"}
226 }
227 ] 212 ]
228 }, 213 },
229 "bulletedList": { 214 "bulletedList": {
@@ -236,10 +221,7 @@
236 "unpressedLabel": "• • •" 221 "unpressedLabel": "• • •"
237 }, 222 },
238 "listeners": [ 223 "listeners": [
239 { 224 { "type": "action", "listener": {"@": "owner"} }
240 "type": "action",
241 "listener": {"@": "owner"}
242 }
243 ] 225 ]
244 }, 226 },
245 "numberedList": { 227 "numberedList": {
@@ -251,12 +233,7 @@
251 "pressedLabel": "1 2 3", 233 "pressedLabel": "1 2 3",
252 "unpressedLabel": "1 2 3" 234 "unpressedLabel": "1 2 3"
253 }, 235 },
254 "listeners": [ 236 "listeners": [ { "type": "action", "listener": {"@": "owner"} } ]
255 {
256 "type": "action",
257 "listener": {"@": "owner"}
258 }
259 ]
260 } 237 }
261 238
262 } 239 }
@@ -285,8 +262,8 @@
285 <button data-montage-id="alignJustify" class="nj-skinned imageButton"><img src="../../../../images/optionsbar/text/AlignJustified.png" class="unselectable"/></button> 262 <button data-montage-id="alignJustify" class="nj-skinned imageButton"><img src="../../../../images/optionsbar/text/AlignJustified.png" class="unselectable"/></button>
286 </div> 263 </div>
287 <div class="btnGroup toolOptionsFloatChildren"> 264 <div class="btnGroup toolOptionsFloatChildren">
288 <button data-montage-id="indent" class="nj-skinned textButton"></button> 265 <button data-montage-id="indent" class="nj-skinned textButton"><img src="../../../../images/optionsbar/text/IndentMore.png" class="unselectable" style="height:16px" /></button>
289 <button data-montage-id="outdent" class="nj-skinned textButton"></button> 266 <button data-montage-id="outdent" class="nj-skinned textButton"><img src="../../../../images/optionsbar/text/IndentLess.png" class="unselectable" style="height:16px" /></button>
290 </div> 267 </div>
291 <div class="btnGroup toolOptionsFloatChildren"> 268 <div class="btnGroup toolOptionsFloatChildren">
292 <button data-montage-id="bulletedList" class="nj-skinned imageButton"><img src="../../../../images/optionsbar/text/BulletedList.png" /></button> 269 <button data-montage-id="bulletedList" class="nj-skinned imageButton"><img src="../../../../images/optionsbar/text/BulletedList.png" /></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 4f944adf..126665e2 100755
--- a/js/components/tools-properties/text-properties.reel/text-properties.js
+++ b/js/components/tools-properties/text-properties.reel/text-properties.js
@@ -8,32 +8,70 @@ var 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; 9var ArrayController = require("montage/ui/controller/array-controller").ArrayController;
10var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties; 10var ToolProperties = require("js/components/tools-properties/tool-properties").ToolProperties;
11var Converter = require("montage/core/converter/converter").Converter;
12 11
13exports.TextProperties = Montage.create(ToolProperties, { 12exports.TextProperties = Montage.create(ToolProperties, {
14 13
15 fontName: {value: null, serializable: true}, 14 fontName: {value: null, serializable: true},