summaryrefslogtreecommitdiff
path: root/public/assets/javascripts/mx/primitives
diff options
context:
space:
mode:
authorJulie Lala <jules@okfoc.us>2014-08-22 12:54:27 -0400
committerJulie Lala <jules@okfoc.us>2014-08-22 12:54:27 -0400
commit4ec4b0e42c06b63962658ae8b886ee9466d09a21 (patch)
tree5e3b0a52d61efa91495932f8cfe53a02dbe95af7 /public/assets/javascripts/mx/primitives
parent978634c1c323240f36548468703a9512710c60e7 (diff)
reject image if it doesnt fit
Diffstat (limited to 'public/assets/javascripts/mx/primitives')
-rw-r--r--public/assets/javascripts/mx/primitives/mx.image.js3
1 files changed, 2 insertions, 1 deletions
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