mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2025-02-18 07:43:13 +03:00
Code Issues Projects Releases Wiki Activity

Fixed race condition for replacing a tiledImage where the world may have changed before the new tiledImage loads. Added test for replacing with addTiledImage.

Browse Source
This commit is contained in:
Larissa Smith 2015-08-21 11:01:32 -06:00
parent f13691f60d
commit 7076d64b1b
2 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/viewer.js
View File

@ -1225,6 +1225,10 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
var _this = this; var _this = this;
if (options.replace) {
options.replaceItem = _this.world.getItemAt(options.index);
}
this._hideMessage(); this._hideMessage();
if (options.placeholderFillStyle === undefined) { if (options.placeholderFillStyle === undefined) {
@ -1290,7 +1294,11 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
_this._loadQueue.splice(0, 1); _this._loadQueue.splice(0, 1);
if (queueItem.options.replace) { if (queueItem.options.replace) {
_this.world.removeItem(_this.world.getItemAt(queueItem.options.index)); var newIndex = _this.world.getIndexOfItem(options.replaceItem);
if (newIndex != -1) {
options.index = newIndex;
}
_this.world.removeItem(options.replaceItem);
} }
tiledImage = new $.TiledImage({ tiledImage = new $.TiledImage({

20
test/modules/multi-image.js
View File

@ -27,7 +27,7 @@
// ---------- // ----------
asyncTest( 'Multi-image operations', function() { asyncTest( 'Multi-image operations', function() {
expect( 21 ); expect( 24 );
viewer.addHandler( "open", function( ) { viewer.addHandler( "open", function( ) {
equal( 1, viewer.world.getItemCount( ), equal( 1, viewer.world.getItemCount( ),
"One item should be present after opening." ); "One item should be present after opening." );
@ -95,6 +95,19 @@
equal( viewer.world.getIndexOfItem( item2 ), 1, equal( viewer.world.getIndexOfItem( item2 ), 1,
"Item 2 should stay at index 1." ); "Item 2 should stay at index 1." );
options.index = 2;
options.replace = true;
viewer.addTiledImage( options );
viewer.world.addHandler( "add-item", function replaceAddItemHandler( event ) {
viewer.world.removeHandler( "add-item", replaceAddItemHandler );
var item4 = event.item;
equal( viewer.world.getItemCount( ), 4,
"4 items should still be present after replacing the second item." );
equal( viewer.world.getIndexOfItem( item4 ), 2,
"Item 4 should be added with index 2." );
equal( viewer.world.getIndexOfItem( item3 ), -1,
"Item 3 should be at index -1." );
viewer.world.addHandler( "remove-item", function removeItemHandler( event ) { viewer.world.addHandler( "remove-item", function removeItemHandler( event ) {
viewer.world.removeHandler( "remove-item", removeItemHandler ); viewer.world.removeHandler( "remove-item", removeItemHandler );
@ -104,8 +117,8 @@
"Item 1 should be at index 2." ); "Item 1 should be at index 2." );
equal( viewer.world.getIndexOfItem( item2 ), -1, equal( viewer.world.getIndexOfItem( item2 ), -1,
"Item 2 should be at index -1." ); "Item 2 should be at index -1." );
equal( viewer.world.getIndexOfItem( item3 ), 1, equal( viewer.world.getIndexOfItem( item4 ), 1,
"Item 3 should be at index 1." ); "Item 4 should be at index 1." );
start(); start();
}); });
@ -115,6 +128,7 @@
}); });
}); });
}); });
});
viewer.open( '/test/data/testpattern.dzi' ); viewer.open( '/test/data/testpattern.dzi' );
}); });