scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-03-13 16:33:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Avoid multiple triggering of Raster.onLoad() on cached rasters.

Browse source
This commit is contained in:
Jürg Lehni 2012-12-02 21:05:40 -08:00
parent cdfd1f596a
commit 523f5c1789
1 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/item/Raster.js
View file

@ -44,30 +44,20 @@ var Raster = this.Raster = PlacedItem.extend(/** @lends Raster# */{
// If it's a string, get the element with this id first.
if (typeof object === 'string') {
var str = object,
that = this,
done = function() {
that.fire('load');
if (that._project.view)
that._project.view.draw(true);
};
object = document.getElementById(str);
if (!object) {
// str could be a URL to load the image from?
object = new Image();
object.src = str;
}
that = this;
// str can be a DOM ID or a URL to load the image from
object = document.getElementById(str) || new Image();
// Trigger the onLoad event on the image once it's loaded
DomEvent.add(object, {
load: function() {
that.setImage(object);
done();
that.fire('load');
if (that._project.view)
that._project.view.draw(true);
}
});
// If the image is already loaded, fire a 'load' event anyway,
// so code does not need to make the distinction, and cachig is
// transparently handled too.
if (object.naturalWidth)
setTimeout(done, 0);
if (!object.src)
object.src = str;
}
/*#*/ } else if (options.server) {
// If we're running on the server and it's a string,