Merge pull request #1229 from imagolive/1218-process-ready-items-in-queue

process ready items always even if others fail
This commit is contained in:
Ian Gilman 2017-06-30 11:09:32 -07:00 committed by GitHub
commit d6bf2db5d8

View File

@ -1383,11 +1383,7 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
this._loadQueue.push(myQueueItem); this._loadQueue.push(myQueueItem);
getTileSourceImplementation( this, options.tileSource, options, function( tileSource ) { function processReadyItems() {
myQueueItem.tileSource = tileSource;
// add everybody at the front of the queue that's ready to go
var queueItem, tiledImage, optionsClone; var queueItem, tiledImage, optionsClone;
while (_this._loadQueue.length) { while (_this._loadQueue.length) {
queueItem = _this._loadQueue[0]; queueItem = _this._loadQueue[0];
@ -1473,9 +1469,20 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
}); });
} }
} }
}
getTileSourceImplementation( this, options.tileSource, options, function( tileSource ) {
myQueueItem.tileSource = tileSource;
// add everybody at the front of the queue that's ready to go
processReadyItems();
}, function( event ) { }, function( event ) {
event.options = options; event.options = options;
raiseAddItemFailed(event); raiseAddItemFailed(event);
// add everybody at the front of the queue that's ready to go
processReadyItems();
} ); } );
}, },