scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-01 02:38:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correctly detect image size on all browsers.

Browse source 
Closes #268.
This commit is contained in:
Jürg Lehni 2013-08-15 11:32:47 -07:00
parent cb6833176c
commit 40f2547e5f
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/item/Raster.js
View file

@ -195,8 +195,13 @@ var Raster = Item.extend(/** @lends Raster# */{
this._image = image;
this._canvas = null;
}
// Both canvas and image have width / height attributes
this._size = new Size(image.width, image.height);
// Both canvas and image have width / height attributes. Due to IE,
// naturalWidth / Height needs to be checked for a swell, because it
// apparently can have width / height set to 0 when the image is
// invisible in the document.
this._size = new Size(
image.naturalWidth || image.width,
image.naturalHeight || image.height);
this._context = null;
this._changed(/*#=*/ Change.GEOMETRY | /*#=*/ Change.PIXELS);
},
@ -293,11 +298,13 @@ var Raster = Item.extend(/** @lends Raster# */{
that._project.view.draw(true);
}
if (image.width && image.height) {
// IE has naturalWidth / Height defined, but width / height set to 0
// when the image is invisible in the document.
if (image.naturalWidth && image.naturalHeight) {
// Fire load event delayed, so behavior is the same as when it's
// actually loaded and we give the code time to install event
setTimeout(loaded, 0);
} else if (!image.src) {
} else {
// Trigger the onLoad event on the image once it's loaded
DomEvent.add(image, {
load: function() {
@ -305,7 +312,9 @@ var Raster = Item.extend(/** @lends Raster# */{
loaded();
}
});
image.src = src;
// A new image created above? Set the source now.
if (!image.src)
image.src = src;
}
this.setImage(image);
/*#*/ } else if (options.node) {