diff options
| author | Jules Laplace <jules@okfoc.us> | 2014-06-20 14:13:29 -0400 |
|---|---|---|
| committer | Jules Laplace <jules@okfoc.us> | 2014-06-20 14:13:29 -0400 |
| commit | 712387da2f75c845807ad4489b29fec34bfe9a56 (patch) | |
| tree | 2fab35671b730b7305b920ba1b63299fd8fa4922 /public/assets/javascripts/mx/primitives | |
| parent | 9151023c978bd3aed20ad00d5d3301dfe7ed2a2a (diff) | |
| parent | 1668d6e2e20c9bd53f3f6a299541c582da9742b4 (diff) | |
merge
Diffstat (limited to 'public/assets/javascripts/mx/primitives')
| -rw-r--r-- | public/assets/javascripts/mx/primitives/mx.image.js | 5 |
1 files changed, 3 insertions, 2 deletions
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 |