diff options
author | Valerio Virgillito | 2012-02-02 15:12:03 -0800 |
---|---|---|
committer | Valerio Virgillito | 2012-02-02 15:12:03 -0800 |
commit | 4c6ea2383650ae328ed1e69c5f9c7c6878c6f810 (patch) | |
tree | 1f4194554032bee6a87aadf15cb647398a98b437 /js/controllers/elements/canvas-controller.js | |
parent | 7303d3a7c3913658bf33be5f99db85a30889cfd9 (diff) | |
parent | d41dee0c552a30724a146965ae4272a268777fc5 (diff) | |
download | ninja-4c6ea2383650ae328ed1e69c5f9c7c6878c6f810.tar.gz |
Merge pull request #12 from mqg734/ToolFixes
Merged pan and zoom tool and 3d stage orientation fixes. Also updated PI to support shapes properties.
Diffstat (limited to 'js/controllers/elements/canvas-controller.js')
-rw-r--r-- | js/controllers/elements/canvas-controller.js | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/js/controllers/elements/canvas-controller.js b/js/controllers/elements/canvas-controller.js index 21de9879..b5df3911 100644 --- a/js/controllers/elements/canvas-controller.js +++ b/js/controllers/elements/canvas-controller.js | |||
@@ -34,12 +34,12 @@ exports.CanvasController = Montage.create(ElementController, { | |||
34 | } | 34 | } |
35 | } | 35 | } |
36 | }, | 36 | }, |
37 | 37 | ||
38 | setProperties: { | 38 | setProperties: { |
39 | value: function(el, props, index) { | 39 | value: function(el, props, index) { |
40 | for(var p in props) { | 40 | for(var p in props) { |
41 | el.elementModel.controller.setProperty(el, p, props[p][index]); | 41 | el.elementModel.controller.setProperty(el, p, props[p][index]); |
42 | } | 42 | } |
43 | } | 43 | } |
44 | } | 44 | } |
45 | }); \ No newline at end of file | 45 | }); \ No newline at end of file |