mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-25 06:36:11 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #679 from fs-webdev/master

Browse Source 
Added error message tracking into the tile loading mechanism. This ex…
This commit is contained in:
Ian Gilman 2015-07-07 09:50:56 -07:00
commit b56c99d367
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 - error: %s", tile, tile.url, errorMsg );
if( !tiledImage.debugMode ){
tile.loading = false;
tile.exists = false;