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>
author: Valerio Virgillito 2012-02-03 12:20:10 -0800
committer: Valerio Virgillito 2012-02-03 12:20:10 -0800
commit: e6e539f345f5e1ac36a595db5d1a1c3700715e88 (patch)
tree: 39846bf1570f9b5a4057b726c54905de9e9e1c02 /js/controllers/elements/shapes-controller.js
parent: 7950424cf704bb221971f4645406b01e6979db18 (diff)
parent: c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff)
download: ninja-e6e539f345f5e1ac36a595db5d1a1c3700715e88.tar.gz
1 files changed, 28 insertions, 0 deletions
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index d34644a7..c5f22138 100644
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -24,6 +24,26 @@ exports.ShapesController = Montage.create(CanvasController, {
                    el.elementModel.shapeModel.GLGeomObj.setInnerRadius(val/100);
                    el.elementModel.shapeModel.GLGeomObj.buildBuffers();
                    break;
+                case "tlRadius":
+                    this.setShapeProperty(el, "tlRadius", value);
+                    el.elementModel.shapeModel.GLGeomObj.setTLRadius(val);
+                    el.elementModel.shapeModel.GLGeomObj.buildBuffers();
+                    break;
+                case "trRadius":
+                    this.setShapeProperty(el, "trRadius", value);
+                    el.elementModel.shapeModel.GLGeomObj.setTRRadius(val);
+                    el.elementModel.shapeModel.GLGeomObj.buildBuffers();
+                    break;
+                case "blRadius":
+                    this.setShapeProperty(el, "blRadius", value);
+                    el.elementModel.shapeModel.GLGeomObj.setBLRadius(val);
+                    el.elementModel.shapeModel.GLGeomObj.buildBuffers();
+                    break;
+                case "brRadius":
+                    this.setShapeProperty(el, "brRadius", value);
+                    el.elementModel.shapeModel.GLGeomObj.setBRRadius(val);
+                    el.elementModel.shapeModel.GLGeomObj.buildBuffers();
+                    break;
                case "width":
                    el.elementModel.shapeModel.GLGeomObj.setWidth(val);
                    CanvasController.setProperty(el, p, value);
@@ -46,8 +66,16 @@ exports.ShapesController = Montage.create(CanvasController, {
    getProperty: {
        value: function(el, p) {
            switch(p) {
+                case "stroke":
+                case "fill":
                case "strokeSize":
                case "innerRadius":
+                case "tlRadius":
+                case "trRadius":
+                case "blRadius":
+                case "brRadius":
+                case "strokeMaterial":
+                case "fillMaterial":
                    return this.getShapeProperty(el, p);
                default:
                    return CanvasController.getProperty(el, p);
author	Valerio Virgillito	2012-02-03 12:20:10 -0800
committer	Valerio Virgillito	2012-02-03 12:20:10 -0800
commit	e6e539f345f5e1ac36a595db5d1a1c3700715e88 (patch)
tree	39846bf1570f9b5a4057b726c54905de9e9e1c02 /js/controllers/elements/shapes-controller.js
parent	7950424cf704bb221971f4645406b01e6979db18 (diff)
parent	c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff)
download	ninja-e6e539f345f5e1ac36a595db5d1a1c3700715e88.tar.gz

diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js index d34644a7..c5f22138 100644 --- a/js/controllers/elements/shapes-controller.js +++ b/js/controllers/elements/shapes-controller.js
@@ -24,6 +24,26 @@ exports.ShapesController = Montage.create(CanvasController, {
24	el.elementModel.shapeModel.GLGeomObj.setInnerRadius(val/100);	24	el.elementModel.shapeModel.GLGeomObj.setInnerRadius(val/100);
25	el.elementModel.shapeModel.GLGeomObj.buildBuffers();	25	el.elementModel.shapeModel.GLGeomObj.buildBuffers();
26	break;	26	break;
		27	case "tlRadius":
		28	this.setShapeProperty(el, "tlRadius", value);
		29	el.elementModel.shapeModel.GLGeomObj.setTLRadius(val);
		30	el.elementModel.shapeModel.GLGeomObj.buildBuffers();
		31	break;
		32	case "trRadius":
		33	this.setShapeProperty(el, "trRadius", value);
		34	el.elementModel.shapeModel.GLGeomObj.setTRRadius(val);
		35	el.elementModel.shapeModel.GLGeomObj.buildBuffers();
		36	break;
		37	case "blRadius":
		38	this.setShapeProperty(el, "blRadius", value);
		39	el.elementModel.shapeModel.GLGeomObj.setBLRadius(val);
		40	el.elementModel.shapeModel.GLGeomObj.buildBuffers();
		41	break;
		42	case "brRadius":
		43	this.setShapeProperty(el, "brRadius", value);
		44	el.elementModel.shapeModel.GLGeomObj.setBRRadius(val);
		45	el.elementModel.shapeModel.GLGeomObj.buildBuffers();
		46	break;
27	case "width":	47	case "width":
28	el.elementModel.shapeModel.GLGeomObj.setWidth(val);	48	el.elementModel.shapeModel.GLGeomObj.setWidth(val);
29	CanvasController.setProperty(el, p, value);	49	CanvasController.setProperty(el, p, value);
@@ -46,8 +66,16 @@ exports.ShapesController = Montage.create(CanvasController, {
46	getProperty: {	66	getProperty: {
47	value: function(el, p) {	67	value: function(el, p) {
48	switch(p) {	68	switch(p) {
		69	case "stroke":
		70	case "fill":
49	case "strokeSize":	71	case "strokeSize":
50	case "innerRadius":	72	case "innerRadius":
		73	case "tlRadius":
		74	case "trRadius":
		75	case "blRadius":
		76	case "brRadius":
		77	case "strokeMaterial":
		78	case "fillMaterial":
51	return this.getShapeProperty(el, p);	79	return this.getShapeProperty(el, p);
52	default:	80	default:
53	return CanvasController.getProperty(el, p);	81	return CanvasController.getProperty(el, p);