From befeb2ed9b7f7086ec0861cbfe4ab6450e1987af Mon Sep 17 00:00:00 2001 From: Julie Lala Date: Fri, 20 Jun 2014 01:00:35 -0400 Subject: disarm delete after upload --- public/assets/javascripts/mx/primitives/mx.image.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'public/assets/javascripts/mx/primitives') diff --git a/public/assets/javascripts/mx/primitives/mx.image.js b/public/assets/javascripts/mx/primitives/mx.image.js index 8b11473..e36c857 100644 --- a/public/assets/javascripts/mx/primitives/mx.image.js +++ b/public/assets/javascripts/mx/primitives/mx.image.js @@ -9,6 +9,7 @@ MX.Image = MX.Object3D.extend({ layer.x = ops.x || 0 layer.y = ops.y || 0 layer.z = ops.z || 0 + layer.scale = ops.scale || 1 layer.backface = ops.backface || false layer.media = ops.media @@ -37,8 +38,8 @@ MX.Image = MX.Object3D.extend({ var image = new Image() image.onload = function(){ layer.scale = layer.ops.scale || 1 - layer.width = image.naturalWidth - layer.height = image.naturalHeight + layer.width = layer.ops.width || image.naturalWidth + layer.height = layer.ops.height || image.naturalHeight layer.x = layer.ops.x || 0 layer.y = layer.ops.y || 0 layer.z = layer.ops.z || 0 -- cgit v1.2.3-70-g09d2