From 3a754133dbc138390503341fd2e9beba3e43aa4b Mon Sep 17 00:00:00 2001 From: Jose Antonio Marquez Date: Fri, 27 Jan 2012 12:05:17 -0800 Subject: Merged old FileIO --- js/controllers/elements/canvas-controller.js | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 js/controllers/elements/canvas-controller.js (limited to 'js/controllers/elements/canvas-controller.js') diff --git a/js/controllers/elements/canvas-controller.js b/js/controllers/elements/canvas-controller.js old mode 100644 new mode 100755 -- cgit v1.2.3 From 0dca2755c07f9928e9d9b0b7feace48edf969900 Mon Sep 17 00:00:00 2001 From: Nivesh Rajbhandari Date: Fri, 27 Jan 2012 15:05:27 -0800 Subject: Updated canvas controller to override setProperties so we don't set styles when updating width and height. Signed-off-by: Nivesh Rajbhandari --- js/controllers/elements/canvas-controller.js | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'js/controllers/elements/canvas-controller.js') diff --git a/js/controllers/elements/canvas-controller.js b/js/controllers/elements/canvas-controller.js index 7af7e824..21de9879 100755 --- a/js/controllers/elements/canvas-controller.js +++ b/js/controllers/elements/canvas-controller.js @@ -33,5 +33,13 @@ exports.CanvasController = Montage.create(ElementController, { ElementController.setProperty(el, p, value); } } + }, + + setProperties: { + value: function(el, props, index) { + for(var p in props) { + el.elementModel.controller.setProperty(el, p, props[p][index]); + } + } } }); \ No newline at end of file -- cgit v1.2.3