diff options
Diffstat (limited to 'js/data/pi')
-rw-r--r-- | js/data/pi/pi-data.js | 64 |
1 files changed, 26 insertions, 38 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index de5cd34d..748f19bb 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,13 +281,13 @@ exports.PiData = Montage.create( Montage, { | |||
279 | [ | 281 | [ |
280 | { | 282 | { |
281 | type : "color", | 283 | type : "color", |
282 | id : "stroke", | 284 | prop: "border", |
283 | prop : "stroke" | 285 | id : "stroke" |
284 | }, | 286 | }, |
285 | { | 287 | { |
286 | type : "color", | 288 | type : "color", |
289 | prop: "background", | ||
287 | id : "fill", | 290 | id : "fill", |
288 | prop : "fill", | ||
289 | divider : true | 291 | divider : true |
290 | } | 292 | } |
291 | ], | 293 | ], |
@@ -315,11 +317,10 @@ exports.PiData = Montage.create( Montage, { | |||
315 | id: "tlRadius", | 317 | id: "tlRadius", |
316 | prop : "tlRadius", | 318 | prop : "tlRadius", |
317 | label: "TL", | 319 | label: "TL", |
318 | valueMutator: parseFloat, | ||
319 | value : 0, | 320 | value : 0, |
320 | min : 0, | 321 | min : 0, |
321 | max : 100, | 322 | max : 100, |
322 | unit : "px", | 323 | unit : "%", |
323 | acceptableUnits: ["px", "pt", "%"] | 324 | acceptableUnits: ["px", "pt", "%"] |
324 | }, | 325 | }, |
325 | { | 326 | { |
@@ -327,12 +328,10 @@ exports.PiData = Montage.create( Montage, { | |||
327 | id : "trRadius", | 328 | id : "trRadius", |
328 | prop : "trRadius", | 329 | prop : "trRadius", |
329 | label : "TR", | 330 | label : "TR", |
330 | valueMutator: parseFloat, | ||
331 | min : 0, | 331 | min : 0, |
332 | max : 100, | 332 | max : 100, |
333 | unit : "px", | 333 | unit : "%", |
334 | acceptableUnits: ["px", "pt", "%"], | 334 | acceptableUnits: ["px", "pt", "%"] |
335 | divider: true | ||
336 | } | 335 | } |
337 | ], | 336 | ], |
338 | [ | 337 | [ |
@@ -341,10 +340,9 @@ exports.PiData = Montage.create( Montage, { | |||
341 | id : "blRadius", | 340 | id : "blRadius", |
342 | prop : "blRadius", | 341 | prop : "blRadius", |
343 | label : "BL", | 342 | label : "BL", |
344 | valueMutator: parseFloat, | ||
345 | min : 0, | 343 | min : 0, |
346 | max : 100, | 344 | max : 100, |
347 | unit : "px", | 345 | unit : "%", |
348 | acceptableUnits: ["px", "pt", "%"] | 346 | acceptableUnits: ["px", "pt", "%"] |
349 | }, | 347 | }, |
350 | { | 348 | { |
@@ -352,10 +350,9 @@ exports.PiData = Montage.create( Montage, { | |||
352 | id : "brRadius", | 350 | id : "brRadius", |
353 | prop : "brRadius", | 351 | prop : "brRadius", |
354 | label : "BR", | 352 | label : "BR", |
355 | valueMutator: parseFloat, | ||
356 | min : 0, | 353 | min : 0, |
357 | max : 100, | 354 | max : 100, |
358 | unit : "px", | 355 | unit : "%", |
359 | acceptableUnits: ["px", "pt", "%"] | 356 | acceptableUnits: ["px", "pt", "%"] |
360 | } | 357 | } |
361 | ] | 358 | ] |
@@ -369,18 +366,13 @@ exports.PiData = Montage.create( Montage, { | |||
369 | { | 366 | { |
370 | type: "dropdown", | 367 | type: "dropdown", |
371 | id: "strokeMaterial", | 368 | id: "strokeMaterial", |
372 | prop: "strokeMaterial", | ||
373 | label: "Stroke", | 369 | label: "Stroke", |
374 | labelField: "_name", | 370 | labelField: "_name", |
375 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }, | 371 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" } |
376 | divider : true | 372 | }, |
377 | } | ||
378 | ], | ||
379 | [ | ||
380 | { | 373 | { |
381 | type: "dropdown", | 374 | type: "dropdown", |
382 | id: "fillMaterial", | 375 | id: "fillMaterial", |
383 | prop: "fillMaterial", | ||
384 | label: "Fill", | 376 | label: "Fill", |
385 | labelField: "_name", | 377 | labelField: "_name", |
386 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" } | 378 | items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" } |
@@ -399,12 +391,13 @@ exports.PiData = Montage.create( Montage, { | |||
399 | [ | 391 | [ |
400 | { | 392 | { |
401 | type : "color", | 393 | type : "color", |
402 | id : "stroke", | 394 | prop: "border", |
403 | prop : "stroke" | 395 | id : "stroke" |
404 | }, | 396 | }, |
405 | { | 397 | { |
406 | type : "color", | 398 | type : "color", |
407 | id : "fill", | 399 | id : "fill", |
400 | prop: "background", | ||
408 | visible : false, | 401 | visible : false, |
409 | divider : true | 402 | divider : true |
410 | } | 403 | } |
@@ -451,13 +444,13 @@ exports.PiData = Montage.create( Montage, { | |||
451 | [ | 444 | [ |
452 | { | 445 | { |
453 | type : "color", | 446 | type : "color", |
454 | id : "stroke", | 447 | prop: "border", |
455 | prop : "stroke" | 448 | id : "stroke" |
456 | }, | 449 | }, |
457 | { | 450 | { |
458 | type : "color", | 451 | type : "color", |
452 | prop: "background", | ||
459 | id : "fill", | 453 | id : "fill", |
460 | prop : "fill", | ||
461 | divider : true | 454 | divider : true |
462 | } | 455 | } |
463 | ], | 456 | ], |
@@ -467,6 +460,7 @@ exports.PiData = Montage.create( Montage, { | |||
467 | id : "strokeSize", | 460 | id : "strokeSize", |
468 | prop : "strokeSize", | 461 | prop : "strokeSize", |
469 | label : "Stroke", | 462 | label : "Stroke", |
463 | valueMutator: parseFloat, | ||
470 | min : 0, | 464 | min : 0, |
471 | max : 100, | 465 | max : 100, |
472 | value : 1, | 466 | value : 1, |
@@ -485,8 +479,7 @@ exports.PiData = Montage.create( Montage, { | |||
485 | type: "hottext", | 479 | type: "hottext", |
486 | id: "innerRadius", | 480 | id: "innerRadius", |
487 | prop: "innerRadius", | 481 | prop: "innerRadius", |
488 | label: "Inner R", | 482 | label: "Inner Radius", |
489 | valueMutator: parseFloat, | ||
490 | value : 0, | 483 | value : 0, |
491 | min : 0, | 484 | min : 0, |
492 | max : 100, | 485 | max : 100, |
@@ -505,18 +498,13 @@ exports.PiData = Montage.create( Montage, { | |||
505 | { |