Merge pull request #428 from rdlester/corsFix

Fixing CORS bug
This commit is contained in:
iangilman 2014-06-27 09:32:15 -07:00
commit ef8bd1a198
2 changed files with 5 additions and 1 deletions

View File

@ -711,6 +711,7 @@ function loadTile( drawer, tile, time ) {
tile.loading = true;
drawer.imageLoader.addJob({
src: tile.url,
crossOriginPolicy: drawer.crossOriginPolicy,
callback: function( image ){
onTileLoad( drawer, tile, time, image );
}

View File

@ -41,6 +41,7 @@
*
* @memberof OpenSeadragon
* @param {String} source - URL of image to download.
* @param {String} crossOriginPolicy - CORS policy to use for downloads
* @param {Function} callback - Called once image has finished downloading.
*/
function ImageJob ( options ) {
@ -69,7 +70,7 @@ ImageJob.prototype = {
this.image = new Image();
if ( _this.crossOriginPolicy !== false ) {
if ( this.crossOriginPolicy !== false ) {
this.image.crossOrigin = this.crossOriginPolicy;
}
@ -122,6 +123,7 @@ $.ImageLoader.prototype = {
* Add an unloaded image to the loader queue.
* @method
* @param {String} src - URL of image to download.
* @param {String} crossOriginPolicy - CORS policy to use for downloads
* @param {Function} callback - Called once image has been downloaded.
*/
addJob: function( options ) {
@ -131,6 +133,7 @@ $.ImageLoader.prototype = {
},
jobOptions = {
src: options.src,
crossOriginPolicy: options.crossOriginPolicy,
callback: complete
},
newJob = new ImageJob( jobOptions );