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

Store data in _data rather than on the image itself.

Browse source
This commit is contained in:
Jürg Lehni 2013-05-28 08:10:51 -07:00
parent a952e6f5ad
commit 73351cbda7
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/item/Raster.js
View file

@ -301,8 +301,9 @@ var Raster = Item.extend(/** @lends Raster# */{
// If we're running on the server and it's a string,
// check if it is a data URL
if (/^data:/.test(src)) {
// Preserve the src in _src since canvas-node eats it.
image.src = image._src = src;
// Preserve the data in this._data since canvas-node eats it.
// TODO: Fix canvas-node instead
image.src = this._data = src;
} else {
// Load it from disk:
// TODO: load images async, calling setImage once loaded as above.
@ -341,12 +342,13 @@ var Raster = Item.extend(/** @lends Raster# */{
// See if the linked image is base64 encoded already, if so reuse it,
// otherwise try using canvas.toDataURL()
/*#*/ if (options.node) {
var src = this._image && this._image._src;
if (this._data)
return this._data;
/*#*/ } else {
var src = this._image && this._image.src;
/*#*/ }
if (/^data:/.test(src))
return src;
/*#*/ }
var canvas = this.getCanvas();
return canvas ? canvas.toDataURL() : null;
},