diff options
| author | Jose Antonio Marquez | 2012-02-02 18:00:45 -0800 |
|---|---|---|
| committer | Jose Antonio Marquez | 2012-02-02 18:00:45 -0800 |
| commit | 04d89daed90c35a4393773ca2e2d0ac3a4c15cd4 (patch) | |
| tree | d0041abc7379ef38b20cce148e5dea6f531b8569 /js/controllers/elements/canvas-controller.js | |
| parent | 4d8306b638c53899403a4f0328c02bf1ab893e8f (diff) | |
| parent | c630ead20487c3948fa36448d3e7d5f7b5cba782 (diff) | |
| download | ninja-04d89daed90c35a4393773ca2e2d0ac3a4c15cd4.tar.gz | |
Merge branch 'refs/heads/NinjaInternal' into FileIO
Conflicts:
.gitignore
js/ninja.reel/ninja.js
Diffstat (limited to 'js/controllers/elements/canvas-controller.js')
| -rwxr-xr-x | 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 100755 --- 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 |