Merge branch 'master' into brushtool

Conflicts: js/controllers/elements/shapes-controller.js
author: Pushkar Joshi 2012-03-27 09:10:58 -0700
committer: Pushkar Joshi 2012-03-27 09:10:58 -0700
commit: 0c26aff9c19c2b39fca06fa6b3bc76b672204065 (patch)
tree: e778f2b9d5d525aa364360d5996536a0a06379bd /js/data
parent: 753244b4713243ab19ca246be674f0b45fb85b72 (diff)
parent: 309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff)
download: ninja-0c26aff9c19c2b39fca06fa6b3bc76b672204065.tar.gz
1 files changed, 68 insertions, 0 deletions
diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js
index ad2f3088..7edc90d8 100755
--- a/js/data/pi/pi-data.js
+++ b/js/data/pi/pi-data.js
@@ -393,6 +393,17 @@ exports.PiData = Montage.create( Montage, {
                    ],
                    [
                        {
+                            type: "checkbox",
+                            id: "animate",
+                            prop: "animate",
+                            defaultValue: true,
+                            value: "Animate",
+                            checked: true,
+                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
+                        }
+                    ],
+                    [
+                        {
                            type: "dropdown",
                            id:   "strokeMaterial",
                            prop:   "strokeMaterial",
@@ -402,6 +413,13 @@ exports.PiData = Montage.create( Montage, {
                            items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },
                            divider : true
+                        },
+                        {
+                            type: "button",
+                            id: "editStrokeMaterial",
+                            prop: "editStrokeMaterial",
+                            label: "Edit",
+                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
                        }
                    ],
                    [
@@ -414,6 +432,13 @@ exports.PiData = Montage.create( Montage, {
                            dataField: "_name",
                            items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
+                        },
+                        {
+                            type: "button",
+                            id: "editFillMaterial",
+                            prop: "editFillMaterial",
+                            label: "Edit",
+                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
                        }
                    ]
                ]
@@ -472,6 +497,17 @@ exports.PiData = Montage.create( Montage, {
                    ],
                    [
                        {
+                            type: "checkbox",
+                            id: "animate",
+                            prop: "animate",
+                            defaultValue: true,
+                            value: "Animate",
+                            checked: true,
+                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
+                        }
+                    ],
+                    [
+                        {
                            type: "dropdown",
                            id:   "strokeMaterial",
                            prop:   "strokeMaterial",
@@ -481,6 +517,13 @@ exports.PiData = Montage.create( Montage, {
                            items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },
                            divider : true
+                        },
+                        {
+                            type: "button",
+                            id: "editStrokeMaterial",
+                            prop: "editStrokeMaterial",
+                            label: "Edit",
+                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
                        }
                    ]
                ]
@@ -559,6 +602,17 @@ exports.PiData = Montage.create( Montage, {
                    ],
                    [
                        {
+                            type: "checkbox",
+                            id: "animate",
+                            prop: "animate",
+                            defaultValue: true,
+                            value: "Animate",
+                            checked: true,
+                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
+                        }
+                    ],
+                    [
+                        {
                            type: "dropdown",
                            id:   "strokeMaterial",
                            prop:   "strokeMaterial",
@@ -568,6 +622,13 @@ exports.PiData = Montage.create( Montage, {
                            items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },
                            divider : true
+                        },
+                        {
+                            type: "button",
+                            id: "editStrokeMaterial",
+                            prop: "editStrokeMaterial",
+                            label: "Edit",
+                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
                        }
                    ],
                    [
@@ -580,6 +641,13 @@ exports.PiData = Montage.create( Montage, {
                            dataField: "_name",
                            items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
+                        },
+                        {
+                            type: "button",
+                            id: "editFillMaterial",
+                            prop: "editFillMaterial",
+                            label: "Edit",
+                            enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
                        }
                    ]
                ]
author	Pushkar Joshi	2012-03-27 09:10:58 -0700
committer	Pushkar Joshi	2012-03-27 09:10:58 -0700
commit	0c26aff9c19c2b39fca06fa6b3bc76b672204065 (patch)
tree	e778f2b9d5d525aa364360d5996536a0a06379bd /js/data
parent	753244b4713243ab19ca246be674f0b45fb85b72 (diff)
parent	309dde5a8c4599cef6a1052c1ff9ee1ad8ec5858 (diff)
download	ninja-0c26aff9c19c2b39fca06fa6b3bc76b672204065.tar.gz

diff --git a/js/data/pi/pi-data.js b/js/data/pi/pi-data.js index ad2f3088..7edc90d8 100755 --- a/js/data/pi/pi-data.js +++ b/js/data/pi/pi-data.js
@@ -393,6 +393,17 @@ exports.PiData = Montage.create( Montage, {
393	],	393	],
394	[	394	[
395	{	395	{
		396	type: "checkbox",
		397	id: "animate",
		398	prop: "animate",
		399	defaultValue: true,
		400	value: "Animate",
		401	checked: true,
		402	enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
		403	}
		404	],
		405	[
		406	{
396	type: "dropdown",	407	type: "dropdown",
397	id: "strokeMaterial",	408	id: "strokeMaterial",
398	prop: "strokeMaterial",	409	prop: "strokeMaterial",
@@ -402,6 +413,13 @@ exports.PiData = Montage.create( Montage, {
402	items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },	413	items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
403	enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },	414	enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },
404	divider : true	415	divider : true
		416	},
		417	{
		418	type: "button",
		419	id: "editStrokeMaterial",
		420	prop: "editStrokeMaterial",
		421	label: "Edit",
		422	enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
405	}	423	}
406	],	424	],
407	[	425	[
@@ -414,6 +432,13 @@ exports.PiData = Montage.create( Montage, {
414	dataField: "_name",	432	dataField: "_name",
415	items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },	433	items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
416	enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }	434	enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
		435	},
		436	{
		437	type: "button",
		438	id: "editFillMaterial",
		439	prop: "editFillMaterial",
		440	label: "Edit",
		441	enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
417	}	442	}
418	]	443	]
419	]	444	]
@@ -472,6 +497,17 @@ exports.PiData = Montage.create( Montage, {
472	],	497	],
473	[	498	[
474	{	499	{
		500	type: "checkbox",
		501	id: "animate",
		502	prop: "animate",
		503	defaultValue: true,
		504	value: "Animate",
		505	checked: true,
		506	enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
		507	}
		508	],
		509	[
		510	{
475	type: "dropdown",	511	type: "dropdown",
476	id: "strokeMaterial",	512	id: "strokeMaterial",
477	prop: "strokeMaterial",	513	prop: "strokeMaterial",
@@ -481,6 +517,13 @@ exports.PiData = Montage.create( Montage, {
481	items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },	517	items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
482	enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },	518	enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },
483	divider : true	519	divider : true
		520	},
		521	{
		522	type: "button",
		523	id: "editStrokeMaterial",
		524	prop: "editStrokeMaterial",
		525	label: "Edit",
		526	enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
484	}	527	}
485	]	528	]
486	]	529	]
@@ -559,6 +602,17 @@ exports.PiData = Montage.create( Montage, {
559	],	602	],
560	[	603	[
561	{	604	{
		605	type: "checkbox",
		606	id: "animate",
		607	prop: "animate",
		608	defaultValue: true,
		609	value: "Animate",
		610	checked: true,
		611	enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
		612	}
		613	],
		614	[
		615	{
562	type: "dropdown",	616	type: "dropdown",
563	id: "strokeMaterial",	617	id: "strokeMaterial",
564	prop: "strokeMaterial",	618	prop: "strokeMaterial",
@@ -568,6 +622,13 @@ exports.PiData = Montage.create( Montage, {
568	items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },	622	items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
569	enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },	623	enabled: { boundObject: "this.controls", boundProperty: "useWebGl" },
570	divider : true	624	divider : true
		625	},
		626	{
		627	type: "button",
		628	id: "editStrokeMaterial",
		629	prop: "editStrokeMaterial",
		630	label: "Edit",
		631	enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
571	}	632	}
572	],	633	],
573	[	634	[
@@ -580,6 +641,13 @@ exports.PiData = Montage.create( Montage, {
580	dataField: "_name",	641	dataField: "_name",
581	items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },	642	items : { boundObject: "this.application.ninja.appModel", boundProperty: "materials" },
582	enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }	643	enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
		644	},
		645	{
		646	type: "button",
		647	id: "editFillMaterial",
		648	prop: "editFillMaterial",
		649	label: "Edit",
		650	enabled: { boundObject: "this.controls", boundProperty: "useWebGl" }
583	}	651	}
584	]	652	]
585	]	653	]