mirror of
https://github.com/openseadragon/openseadragon.git
synced 2024-11-22 13:16:10 +03:00
Merge pull request #2334 from Ughuuu/Fix-TileLoader-re-trying-even-if-successful
Fix TileLoader re-trying even if successful #2
This commit is contained in:
commit
f91dbdd2c7
@ -62,7 +62,7 @@ $.ImageJob = function(options) {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Data object which will contain downloaded image data.
|
* Data object which will contain downloaded image data.
|
||||||
* @member {Image|*} image data object, by default an Image object (depends on TileSource)
|
* @member {Image|*} data data object, by default an Image object (depends on TileSource)
|
||||||
* @memberof OpenSeadragon.ImageJob#
|
* @memberof OpenSeadragon.ImageJob#
|
||||||
*/
|
*/
|
||||||
this.data = null;
|
this.data = null;
|
||||||
@ -234,7 +234,7 @@ $.ImageLoader.prototype = {
|
|||||||
* @param callback - Called once cleanup is finished.
|
* @param callback - Called once cleanup is finished.
|
||||||
*/
|
*/
|
||||||
function completeJob(loader, job, callback) {
|
function completeJob(loader, job, callback) {
|
||||||
if (job.errorMsg !== '' && (job.image === null || job.image === undefined) && job.tries < 1 + loader.tileRetryMax) {
|
if (job.errorMsg !== '' && (job.data === null || job.data === undefined) && job.tries < 1 + loader.tileRetryMax) {
|
||||||
loader.failedTiles.push(job);
|
loader.failedTiles.push(job);
|
||||||
}
|
}
|
||||||
var nextJob;
|
var nextJob;
|
||||||
|
@ -1621,6 +1621,8 @@ $.extend($.TiledImage.prototype, $.EventSource.prototype, /** @lends OpenSeadrag
|
|||||||
tile.loading = false;
|
tile.loading = false;
|
||||||
tile.exists = false;
|
tile.exists = false;
|
||||||
return;
|
return;
|
||||||
|
} else {
|
||||||
|
tile.exists = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( time < this.lastResetTime ) {
|
if ( time < this.lastResetTime ) {
|
||||||
|
Loading…
Reference in New Issue
Block a user