Merge remote-tracking branch 'origin/master' into Navigator-Resize

This commit is contained in:
Mark Salsbery 2013-12-13 09:31:19 -08:00
commit 3deb20271a
2 changed files with 2 additions and 0 deletions

View File

@ -5,6 +5,7 @@ OPENSEADRAGON CHANGELOG
* Fixed: Nav button highlight states aren't quite aligned on Firefox (#303) * Fixed: Nav button highlight states aren't quite aligned on Firefox (#303)
* Added ControlAnchor options for default controls (#304) * Added ControlAnchor options for default controls (#304)
* Enabled basic cross-domain tile loading without tainting canvas (works in Chrome and Firefox) (#308)
1.0.0: 1.0.0:

View File

@ -419,6 +419,7 @@ $.Drawer.prototype = /** @lends OpenSeadragon.Drawer.prototype */{
this.downloading++; this.downloading++;
image = new Image(); image = new Image();
image.crossOrigin = 'Anonymous';
complete = function( imagesrc, resultingImage ){ complete = function( imagesrc, resultingImage ){
_this.downloading--; _this.downloading--;