aboutsummaryrefslogtreecommitdiff
path: root/js/controllers/elements/shapes-controller.js
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-04-17 13:28:06 -0700
committerNivesh Rajbhandari2012-04-17 13:28:06 -0700
commit88f83856dcec50fd850622eec21195379e5844fb (patch)
treef6aa54de1100d6d5b9a2e3683f10daf61f865ad1 /js/controllers/elements/shapes-controller.js
parentf11ed767396996c236bb8ef0e5f89fedddcaa0d7 (diff)
parentcacb4a21825818af392c2949967b0f3c1df509c5 (diff)
downloadninja-88f83856dcec50fd850622eec21195379e5844fb.tar.gz
Merge branch 'refs/heads/ninja-internal' into AllFixes
Diffstat (limited to 'js/controllers/elements/shapes-controller.js')
-rwxr-xr-xjs/controllers/elements/shapes-controller.js9
1 files changed, 3 insertions, 6 deletions
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js
index 14cdc473..cd7fa16d 100755
--- a/js/controllers/elements/shapes-controller.js
+++ b/js/controllers/elements/shapes-controller.js
@@ -74,12 +74,9 @@ exports.ShapesController = Montage.create(CanvasController, {
74 w += delta; 74 w += delta;
75 h += delta; 75 h += delta;
76 } 76 }
77 this.application.ninja.elementMediator.setProperties([el], 77
78 { "left": [l + "px"], 78 this.application.ninja.elementMediator.setProperties([{element:el, properties:{left: l + "px", top: t + "px", width: w + "px", height:h + "px"}}], eventType, source);
79 "top": [t + "px"], 79
80 "width": [w + "px"],
81 "height": [h + "px"] },
82 eventType, source );
83 } 80 }
84 el.elementModel.shapeModel.GLGeomObj.setStrokeWidth(val); 81 el.elementModel.shapeModel.GLGeomObj.setStrokeWidth(val);
85 el.elementModel.shapeModel.GLGeomObj.buildBuffers(); 82 el.elementModel.shapeModel.GLGeomObj.buildBuffers();