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

Exit early if an array is provided as a tile source.

Browse Source
This commit is contained in:
Antoine Vandecreme 2015-11-09 18:19:17 -05:00
parent 954cbbdc46
commit 7c62974e57
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/viewer.js
View File

@ -1286,19 +1286,21 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
} }
} }
this._loadQueue.push(myQueueItem); if ($.isArray(options.tileSource)) {
setTimeout(function() {
getTileSourceImplementation( this, options.tileSource, function( tileSource ) {
if ( tileSource instanceof Array ) {
raiseAddItemFailed({ raiseAddItemFailed({
message: "[Viewer.addTiledImage] Sequences can not be added; add them one at a time instead.", message: "[Viewer.addTiledImage] Sequences can not be added; add them one at a time instead.",
source: tileSource, source: options.tileSource,
options: options options: options
}); });
});
return; return;
} }
this._loadQueue.push(myQueueItem);
getTileSourceImplementation( this, options.tileSource, function( tileSource ) {
myQueueItem.tileSource = tileSource; myQueueItem.tileSource = tileSource;
// add everybody at the front of the queue that's ready to go // add everybody at the front of the queue that's ready to go
@ -2101,8 +2103,6 @@ function getTileSourceImplementation( viewer, tileSource, successCallback,
var options = $TileSource.prototype.configure.apply( _this, [ tileSource ] ); var options = $TileSource.prototype.configure.apply( _this, [ tileSource ] );
waitUntilReady(new $TileSource(options), tileSource); waitUntilReady(new $TileSource(options), tileSource);
} }
} else if ($.isArray(tileSource)) {
successCallback(tileSource);
} else { } else {
//can assume it's already a tile source implementation //can assume it's already a tile source implementation
waitUntilReady(tileSource, tileSource); waitUntilReady(tileSource, tileSource);