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 #734 from fs-webdev/master

Browse Source 
Added cancel pending images to world.removeAll
This commit is contained in:
Ian Gilman 2015-09-24 09:11:46 -07:00
commit 8368138e17
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/viewer.js
View File

@ -1243,7 +1243,7 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
}; };
function raiseAddItemFailed( event ) { function raiseAddItemFailed( event ) {
for (var i = 0; i < _this._loadQueue; i++) { for (var i = 0; i < _this._loadQueue.length; i++) {
if (_this._loadQueue[i] === myQueueItem) { if (_this._loadQueue[i] === myQueueItem) {
_this._loadQueue.splice(i, 1); _this._loadQueue.splice(i, 1);
break; break;
@ -1982,6 +1982,13 @@ $.extend( $.Viewer.prototype, $.EventSource.prototype, $.ControlDock.prototype,
for ( i = 0; i < length; i++ ) { for ( i = 0; i < length; i++ ) {
this.currentOverlays[ i ].drawHTML( this.overlaysContainer, this.viewport ); this.currentOverlays[ i ].drawHTML( this.overlaysContainer, this.viewport );
} }
},
/**
* Cancel the "in flight" images.
*/
_cancelPendingImages: function() {
this._loadQueue = [];
} }
}); });

2
src/world.js
View File

@ -202,6 +202,8 @@ $.extend( $.World.prototype, $.EventSource.prototype, /** @lends OpenSeadragon.W
* @fires OpenSeadragon.World.event:metrics-change * @fires OpenSeadragon.World.event:metrics-change
*/ */
removeAll: function() { removeAll: function() {
// We need to make sure any pending images are canceled so the world items don't get messed up
this.viewer._cancelPendingImages();
var item; var item;
for (var i = 0; i < this._items.length; i++) { for (var i = 0; i < this._items.length; i++) {
item = this._items[i]; item = this._items[i];