aboutsummaryrefslogtreecommitdiff
path: root/js/data/pi
diff options
context:
space:
mode:
authorPushkar Joshi2012-02-07 07:21:27 -0800
committerPushkar Joshi2012-02-07 07:21:27 -0800
commit4bbe42e6d01fd0f81d13357a75b40eae9925dda3 (patch)
tree57f49ebfa5d3fcef28753b34015209edda6e620a /js/data/pi
parente7aa17a9b472640355e95c54841399f6203050d4 (diff)
parent8950b342d1eda8bfa195372e1c17363a409651cd (diff)
downloadninja-4bbe42e6d01fd0f81d13357a75b40eae9925dda3.tar.gz
Merge branch 'master' into pentool
Diffstat (limited to 'js/data/pi')
-rw-r--r--js/data/pi/pi-data.js52
1 files changed, 38 insertions, 14 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index f162e919..dd75e255 100644
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -23,13 +23,13 @@ exports.PiData = Montage.create( Montage, {
23 { 23 {
24 type : "color", 24 type : "color",
25 id : "colorStroke", 25 id : "colorStroke",
26 prop: "border-color", 26 prop: "border",
27 label : "Stroke" 27 label : "Stroke"
28 }, 28 },
29 { 29 {
30 type : "color", 30 type : "color",
31 id : "colorFill", 31 id : "colorFill",
32 prop: "background-color", 32 prop: "background",
33 divider : true 33 divider : true
34 } 34 }
35 ], 35 ],
@@ -102,11 +102,13 @@ exports.PiData = Montage.create( Montage, {
102 { 102 {
103 type : "color", 103 type : "color",
104 id : "colorStroke", 104 id : "colorStroke",
105 prop: "border",
105 label : "Stroke" 106 label : "Stroke"
106 }, 107 },
107 { 108 {
108 type : "color", 109 type : "color",
109 id : "colorFill", 110 id : "colorFill",
111 prop: "background",
110 divider : true 112 divider : true
111 } 113 }
112 ], 114 ],
@@ -221,13 +223,13 @@ exports.PiData = Montage.create( Montage, {
221 { 223 {
222 type : "color", 224 type : "color",
223 id : "colorStroke", 225 id : "colorStroke",
224 prop: "border-color", 226 prop: "border",
225 label : "Stroke" 227 label : "Stroke"
226 }, 228 },
227 { 229 {
228 type : "color", 230 type : "color",
229 id : "colorFill", 231 id : "colorFill",
230 prop: "background-color", 232 prop: "background",
231 divider : true 233 divider : true
232 } 234 }
233 ], 235 ],
@@ -279,10 +281,12 @@ exports.PiData = Montage.create( Montage, {
279 [ 281 [
280 { 282 {
281 type : "color", 283 type : "color",
284 prop: "border",
282 id : "stroke" 285 id : "stroke"
283 }, 286 },
284 { 287 {
285 type : "color", 288 type : "color",
289 prop: "background",
286 id : "fill", 290 id : "fill",
287 divider : true 291 divider : true
288 } 292 }
@@ -313,10 +317,11 @@ exports.PiData = Montage.create( Montage, {
313 id: "tlRadius", 317 id: "tlRadius",
314 prop : "tlRadius", 318 prop : "tlRadius",
315 label: "TL", 319 label: "TL",
320 valueMutator: parseFloat,
316 value : 0, 321 value : 0,
317 min : 0, 322 min : 0,
318 max : 100, 323 max : 100,
319 unit : "%", 324 unit : "px",
320 acceptableUnits: ["px", "pt", "%"] 325 acceptableUnits: ["px", "pt", "%"]
321 }, 326 },
322 { 327 {
@@ -324,10 +329,12 @@ exports.PiData = Montage.create( Montage, {
324 id : "trRadius", 329 id : "trRadius",
325 prop : "trRadius", 330 prop : "trRadius",
326 label : "TR", 331 label : "TR",
332 valueMutator: parseFloat,
327 min : 0, 333 min : 0,
328 max : 100, 334 max : 100,
329 unit : "%", 335 unit : "px",
330 acceptableUnits: ["px", "pt", "%"] 336 acceptableUnits: ["px", "pt", "%"],
337 divider: true
331 } 338 }
332 ], 339 ],
333 [ 340 [
@@ -336,9 +343,10 @@ exports.PiData = Montage.create( Montage, {
336 id : "blRadius", 343 id : "blRadius",
337 prop : "blRadius", 344 prop : "blRadius",
338 label : "BL", 345 label : "BL",
346 valueMutator: parseFloat,
339 min : 0, 347 min : 0,
340 max : 100, 348 max : 100,
341 unit : "%", 349 unit : "px",
342 acceptableUnits: ["px", "pt", "%"] 350 acceptableUnits: ["px", "pt", "%"]
343 }, 351 },
344 { 352 {
@@ -346,9 +354,10 @@ exports.PiData = Montage.create( Montage, {
346 id : "brRadius", 354 id : "brRadius",
347 prop : "brRadius", 355 prop : "brRadius",
348 label : "BR", 356 label : "BR",
357 valueMutator: parseFloat,
349 min : 0, 358 min : 0,
350 max : 100, 359 max : 100,
351 unit : "%", 360 unit : "px",
352 acceptableUnits: ["px", "pt", "%"] 361 acceptableUnits: ["px", "pt", "%"]
353 } 362 }
354 ] 363 ]
@@ -362,13 +371,18 @@ exports.PiData = Montage.create( Montage, {
362 { 371 {
363 type: "dropdown", 372 type: "dropdown",
364 id: "strokeMaterial", 373 id: "strokeMaterial",
374 prop: "strokeMaterial",
365 label: "Stroke", 375 label: "Stroke",
366 labelField: "_name", 376 labelField: "_name",
367 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" } 377 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
368 }, 378 divider : true
379 }
380 ],
381 [
369 { 382 {
370 type: "dropdown", 383 type: "dropdown",
371 id: "fillMaterial", 384 id: "fillMaterial",
385 prop: "fillMaterial",
372 label: "Fill", 386 label: "Fill",
373 labelField: "_name", 387 labelField: "_name",
374 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" } 388 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }
@@ -387,11 +401,13 @@ exports.PiData = Montage.create( Montage, {
387 [ 401 [
388 { 402 {
389 type : "color", 403 type : "color",
404 prop: "border",
390 id : "stroke" 405 id : "stroke"
391 }, 406 },
392 { 407 {
393 type : "color", 408 type : "color",
394 id : "fill", 409 id : "fill",
410 prop: "background",
395 visible : false, 411 visible : false,
396 divider : true 412 divider : true
397 } 413 }
@@ -438,10 +454,12 @@ exports.PiData = Montage.create( Montage, {
438 [ 454 [
439 { 455 {
440 type : "color", 456 type : "color",
457 prop: "border",
441 id : "stroke" 458 id : "stroke"
442 }, 459 },
443 { 460 {
444 type : "color", 461 type : "color",
462 prop: "background",
445 id : "fill", 463 id : "fill",
446 divider : true 464 divider : true
447 } 465 }
@@ -471,7 +489,8 @@ exports.PiData = Montage.create( Montage, {
471 type: "hottext", 489 type: "hottext",
472 id: "innerRadius", 490 id: "innerRadius",
473 prop: "innerRadius", 491 prop: "innerRadius",
474 label: "Inner Radius", 492 label: "Inner R",
493 valueMutator: parseFloat,
475 value : 0, 494 value : 0,
476 min : 0, 495 min : 0,
477 max : 100, 496 max : 100,
@@ -490,13 +509,18 @@ exports.PiData = Montage.create( Montage, {
490 { 509 {
491 type: "dropdown", 510 type: "dropdown",
492 id: "strokeMaterial", 511 id: "strokeMaterial",
512 prop: "strokeMaterial",
493 label: "Stroke", 513 label: "Stroke",
494 labelFunction: function(item) { return item.getName(); }, 514 labelFunction: function(item) { return item.getName(); },
495 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" } 515 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
496 }, 516 divider : true
517 }
518 ],
519 [