aboutsummaryrefslogtreecommitdiff
path: root/js/data
diff options
context:
space:
mode:
authorValerio Virgillito2012-02-03 12:20:10 -0800
committerValerio Virgillito2012-02-03 12:20:10 -0800
commite6e539f345f5e1ac36a595db5d1a1c3700715e88 (patch)
tree39846bf1570f9b5a4057b726c54905de9e9e1c02 /js/data
parent7950424cf704bb221971f4645406b01e6979db18 (diff)
parentc630ead20487c3948fa36448d3e7d5f7b5cba782 (diff)
downloadninja-e6e539f345f5e1ac36a595db5d1a1c3700715e88.tar.gz
Merge branch 'master' into components
Conflicts: node_modules/montage/ui/bluemoon/progress.reel/progress.html node_modules/montage/ui/image2.reel/image2.html node_modules/ninja-components/effect/desaturate-effect.js node_modules/ninja-components/effect/effect.js node_modules/ninja-components/effect/invert-effect.js node_modules/ninja-components/effect/kaliedoscope-effect.js node_modules/ninja-components/effect/multiply-effect.js node_modules/ninja-components/effect/sepia-effect.js node_modules/ninja-components/flow-controller.reel/flow-controller.html node_modules/ninja-components/flow-controller.reel/flow-controller.js node_modules/ninja-components/flow-offset.js node_modules/ninja-components/hottext.reel/hottext.css node_modules/ninja-components/hottext.reel/hottext.html node_modules/ninja-components/hottext.reel/hottext.js node_modules/ninja-components/hottextunit.reel/hottextunit.css node_modules/ninja-components/hottextunit.reel/hottextunit.html node_modules/ninja-components/hottextunit.reel/hottextunit.js node_modules/ninja-components/image2.reel/image2.html node_modules/ninja-components/image2.reel/image2.js node_modules/ninja-components/image3d.reel/image3d.html node_modules/ninja-components/image3d.reel/image3d.js node_modules/ninja-components/photo-editor.reel/photo-editor.css node_modules/ninja-components/photo-editor.reel/photo-editor.html node_modules/ninja-components/photo-editor.reel/photo-editor.js node_modules/ninja-components/slider-base.js user-document-templates/montage-application-cloud/appdelegate.js Signed-off-by: Valerio Virgillito <valerio@motorola.com>
Diffstat (limited to 'js/data')
-rw-r--r--js/data/pi/pi-data.js48
1 files changed, 34 insertions, 14 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index 30b1f60d..9edb0399 100644
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -279,11 +279,13 @@ exports.PiData = Montage.create( Montage, {
279 [ 279 [
280 { 280 {
281 type : "color", 281 type : "color",
282 id : "stroke" 282 id : "stroke",
283 prop : "stroke"
283 }, 284 },
284 { 285 {
285 type : "color", 286 type : "color",
286 id : "fill", 287 id : "fill",
288 prop : "fill",
287 divider : true 289 divider : true
288 } 290 }
289 ], 291 ],
@@ -313,10 +315,11 @@ exports.PiData = Montage.create( Montage, {
313 id: "tlRadius", 315 id: "tlRadius",
314 prop : "tlRadius", 316 prop : "tlRadius",
315 label: "TL", 317 label: "TL",
318 valueMutator: parseFloat,
316 value : 0, 319 value : 0,
317 min : 0, 320 min : 0,
318 max : 100, 321 max : 100,
319 unit : "%", 322 unit : "px",
320 acceptableUnits: ["px", "pt", "%"] 323 acceptableUnits: ["px", "pt", "%"]
321 }, 324 },
322 { 325 {
@@ -324,10 +327,12 @@ exports.PiData = Montage.create( Montage, {
324 id : "trRadius", 327 id : "trRadius",
325 prop : "trRadius", 328 prop : "trRadius",
326 label : "TR", 329 label : "TR",
330 valueMutator: parseFloat,
327 min : 0, 331 min : 0,
328 max : 100, 332 max : 100,
329 unit : "%", 333 unit : "px",
330 acceptableUnits: ["px", "pt", "%"] 334 acceptableUnits: ["px", "pt", "%"],
335 divider: true
331 } 336 }
332 ], 337 ],
333 [ 338 [
@@ -336,9 +341,10 @@ exports.PiData = Montage.create( Montage, {
336 id : "blRadius", 341 id : "blRadius",
337 prop : "blRadius", 342 prop : "blRadius",
338 label : "BL", 343 label : "BL",
344 valueMutator: parseFloat,
339 min : 0, 345 min : 0,
340 max : 100, 346 max : 100,
341 unit : "%", 347 unit : "px",
342 acceptableUnits: ["px", "pt", "%"] 348 acceptableUnits: ["px", "pt", "%"]
343 }, 349 },
344 { 350 {
@@ -346,9 +352,10 @@ exports.PiData = Montage.create( Montage, {
346 id : "brRadius", 352 id : "brRadius",
347 prop : "brRadius", 353 prop : "brRadius",
348 label : "BR", 354 label : "BR",
355 valueMutator: parseFloat,
349 min : 0, 356 min : 0,
350 max : 100, 357 max : 100,
351 unit : "%", 358 unit : "px",
352 acceptableUnits: ["px", "pt", "%"] 359 acceptableUnits: ["px", "pt", "%"]
353 } 360 }
354 ] 361 ]
@@ -362,13 +369,18 @@ exports.PiData = Montage.create( Montage, {
362 { 369 {
363 type: "dropdown", 370 type: "dropdown",
364 id: "strokeMaterial", 371 id: "strokeMaterial",
372 prop: "strokeMaterial",
365 label: "Stroke", 373 label: "Stroke",
366 labelField: "_name", 374 labelField: "_name",
367 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" } 375 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
368 }, 376 divider : true
377 }
378 ],
379 [
369 { 380 {
370 type: "dropdown", 381 type: "dropdown",
371 id: "fillMaterial", 382 id: "fillMaterial",
383 prop: "fillMaterial",
372 label: "Fill", 384 label: "Fill",
373 labelField: "_name", 385 labelField: "_name",
374 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" } 386 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }
@@ -387,7 +399,8 @@ exports.PiData = Montage.create( Montage, {
387 [ 399 [
388 { 400 {
389 type : "color", 401 type : "color",
390 id : "stroke" 402 id : "stroke",
403 prop : "stroke"
391 }, 404 },
392 { 405 {
393 type : "color", 406 type : "color",
@@ -438,11 +451,13 @@ exports.PiData = Montage.create( Montage, {
438 [ 451 [
439 { 452 {
440 type : "color", 453 type : "color",
441 id : "stroke" 454 id : "stroke",
455 prop : "stroke"
442 }, 456 },
443 { 457 {
444 type : "color", 458 type : "color",
445 id : "fill", 459 id : "fill",
460 prop : "fill",
446 divider : true 461 divider : true
447 } 462 }
448 ], 463 ],
@@ -452,7 +467,6 @@ exports.PiData = Montage.create( Montage, {
452 id : "strokeSize", 467 id : "strokeSize",
453 prop : "strokeSize", 468 prop : "strokeSize",
454 label : "Stroke", 469 label : "Stroke",
455 valueMutator: parseFloat,
456 min : 0, 470 min : 0,
457 max : 100, 471 max : 100,
458 value : 1, 472 value : 1,
@@ -471,7 +485,8 @@ exports.PiData = Montage.create( Montage, {
471 type: "hottext", 485 type: "hottext",
472 id: "innerRadius", 486 id: "innerRadius",
473 prop: "innerRadius", 487 prop: "innerRadius",
474 label: "Inner Radius", 488 label: "Inner R",
489 valueMutator: parseFloat,
475 value : 0, 490 value : 0,
476 min : 0, 491 min : 0,
477 max : 100, 492 max : 100,
@@ -490,13 +505,18 @@ exports.PiData = Montage.create( Montage, {
490 { 505 {
491 type: "dropdown", 506 type: "dropdown",
492 id: "strokeMaterial", 507 id: "strokeMaterial",
508 prop: "strokeMaterial",
493 label: "Stroke", 509 label: "Stroke",
494 labelFunction: function(item) { return item.getName(); }, 510 labelFunction: function(item) { return item.getName(); },
495 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" } 511 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
496 }, 512 divider : true
513 }
514 ],
515 [
497 { 516 {
498 type: "dropdown", 517 type: "dropdown",
499 id: "fillMaterial", 518 id: "fillMaterial",
519 prop: "fillMaterial",
500 label: "Fill", 520 label: "Fill",
501 labelField: "_name", 521 labelField: "_name",
502 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" } 522 items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" }
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-02 04:03:52 +0000