Hopiu/fabric.js
1
0
Fork 0
mirror of https://github.com/Hopiu/fabric.js.git synced 2026-05-14 16:53:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1282 from wilsonwc/master

Browse source 
Fix for #1237
This commit is contained in:
Juriy Zaytsev 2014-04-22 14:28:02 -04:00
commit c7b4b52981
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/shapes/image.class.js
View file

@ -374,7 +374,7 @@
options || (options = { });
this.setOptions(options);
this._setWidthHeight(options);
if (this._element) {
if (this._element && this.crossOrigin) {
this._element.crossOrigin = this.crossOrigin;
}
},

4
test/unit/image.js
View file

@ -161,14 +161,16 @@
equal(objRepr.crossOrigin, '', 'toObject should return proper crossOrigin value');
var elImage2 = _createImageElement();
elImage2.crossOrigin = 'anonymous';
image.setElement(elImage2);
equal(elImage2.crossOrigin, '', 'setElement should set proper crossOrigin on an img element');
equal(elImage2.crossOrigin, 'anonymous', 'setElement should set proper crossOrigin on an img element');
// fromObject doesn't work on Node :/
if (fabric.isLikelyNode) {
start();
return;
}
fabric.Image.fromObject(objRepr, function(img) {
equal(img.crossOrigin, '');
start();