diff options
| author | Nivesh Rajbhandari | 2012-04-17 11:10:10 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-04-17 11:10:10 -0700 |
| commit | 6d3af6cb9dc8223102854ad95a5c4c501fc62c8b (patch) | |
| tree | 07afdbeacd26f01414933d5b3318786cec30f4a8 /js/controllers/elements/shapes-controller.js | |
| parent | 2a87a750f06003fc62e8e0e73983e14ce24fc7a7 (diff) | |
| parent | cacb4a21825818af392c2949967b0f3c1df509c5 (diff) | |
| download | ninja-6d3af6cb9dc8223102854ad95a5c4c501fc62c8b.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into WebGLFixes
Diffstat (limited to 'js/controllers/elements/shapes-controller.js')
| -rwxr-xr-x | js/controllers/elements/shapes-controller.js | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/js/controllers/elements/shapes-controller.js b/js/controllers/elements/shapes-controller.js index a446ef05..e9dde5fc 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(); |