From 4ec4b0e42c06b63962658ae8b886ee9466d09a21 Mon Sep 17 00:00:00 2001 From: Julie Lala Date: Fri, 22 Aug 2014 12:54:27 -0400 Subject: reject image if it doesnt fit --- public/assets/javascripts/mx/primitives/mx.image.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'public/assets/javascripts/mx') diff --git a/public/assets/javascripts/mx/primitives/mx.image.js b/public/assets/javascripts/mx/primitives/mx.image.js index a640620..575e9c0 100644 --- a/public/assets/javascripts/mx/primitives/mx.image.js +++ b/public/assets/javascripts/mx/primitives/mx.image.js @@ -10,7 +10,7 @@ MX.Image = MX.Object3D.extend({ this.z = ops.z || 0 this.scale = ops.scale || 1 this.backface = ops.backface || false - + ops.className && this.el.classList.add(ops.className) this.backface && this.el.classList.add("backface-visible") this.el.classList.add("image") @@ -27,6 +27,7 @@ MX.Image = MX.Object3D.extend({ var image = new Image() image.onload = function(){ + if (! layer.ops) return layer.scale = layer.ops.scale || 1 layer.width = layer.ops.width || image.naturalWidth layer.height = layer.ops.height || image.naturalHeight -- cgit v1.2.3-70-g09d2