mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2025-01-19 09:11:45 +03:00
Code Issues Projects Releases Wiki Activity

Added error message tracking into the tile loading mechanism. This exposes the reason for the error in the console.log message

Browse Source
This commit is contained in:
Grant Echols 2015-07-06 14:56:41 -06:00
parent 5991b21cb9
commit 8b71876c37
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/imageloader.js
View File

@ -51,6 +51,7 @@ function ImageJob ( options ) {
}
ImageJob.prototype = {
errorMsg: null,
start: function(){
var _this = this;
@ -64,10 +65,12 @@ ImageJob.prototype = {
_this.finish( true );
};
this.image.onabort = this.image.onerror = function(){
_this.errorMsg = "Image load aborted";
_this.finish( false );
};
this.jobId = window.setTimeout( function(){
_this.errorMsg = "Image load exceeded timeout";
_this.finish( false );
}, this.timeout);
@ -173,7 +176,7 @@ function completeJob( loader, job, callback ) {
loader.jobsInProgress++;
}
callback( job.image );
callback( job.image, job.errorMsg );
}
}( OpenSeadragon ));

8
src/tiledimage.js
View File

@ -1011,8 +1011,8 @@ function loadTile( tiledImage, tile, time ) {
tiledImage._imageLoader.addJob({
src: tile.url,
crossOriginPolicy: tiledImage.crossOriginPolicy,
callback: function( image ){
onTileLoad( tiledImage, tile, time, image );
callback: function( image, errorMsg ){
onTileLoad( tiledImage, tile, time, image, errorMsg );
},
abort: function() {
tile.loading = false;
@ -1020,9 +1020,9 @@ function loadTile( tiledImage, tile, time ) {
});
}
function onTileLoad( tiledImage, tile, time, image ) {
function onTileLoad( tiledImage, tile, time, image, errorMsg ) {
if ( !image ) {
$.console.log( "Tile %s failed to load: %s", tile, tile.url );
$.console.log( "Tile %s failed to load: %s", tile.url, errorMsg );
if( !tiledImage.debugMode ){
tile.loading = false;
tile.exists = false;