mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-25 22:56:11 +03:00
Code Issues Projects Releases Wiki Activity

Fix timer leak after multiple Viewer.open() calls

Browse Source 
Keep a counter of Viewer.close() calls in private state and a copy in
the timer's closure, and stop the timer when they no longer match.

Fixes #76.
This commit is contained in:
Benjamin Gilbert 2013-04-25 00:37:36 -04:00
parent 9eb19d6c9c
commit 47aba60940
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/viewer.js
View File

@ -115,6 +115,7 @@ $.Viewer = function( options ) {
THIS[ this.hash ] = { THIS[ this.hash ] = {
"fsBoundsDelta": new $.Point( 1, 1 ), "fsBoundsDelta": new $.Point( 1, 1 ),
"prevContainerSize": null, "prevContainerSize": null,
"closeCount": 0,
"animating": false, "animating": false,
"forceRedraw": false, "forceRedraw": false,
"mouseInside": false, "mouseInside": false,
@ -368,6 +369,8 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype,
VIEWERS[ this.hash ] = null; VIEWERS[ this.hash ] = null;
delete VIEWERS[ this.hash ]; delete VIEWERS[ this.hash ];
THIS[ this.hash ].closeCount++;
this.raiseEvent( 'close', { viewer: this } ); this.raiseEvent( 'close', { viewer: this } );
return this; return this;
@ -948,6 +951,7 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype,
function openTileSource( viewer, source ) { function openTileSource( viewer, source ) {
var _this = viewer, var _this = viewer,
overlay, overlay,
closeCount,
i; i;
if ( _this.source ) { if ( _this.source ) {
@ -1064,7 +1068,12 @@ function openTileSource( viewer, source ) {
THIS[ _this.hash ].animating = false; THIS[ _this.hash ].animating = false;
THIS[ _this.hash ].forceRedraw = true; THIS[ _this.hash ].forceRedraw = true;
scheduleUpdate( _this, updateMulti );
// Use local copy in closure
closeCount = THIS[ _this.hash ].closeCount;
scheduleUpdate( _this, function(){
updateMulti( _this, closeCount );
} );
//Assuming you had programatically created a bunch of overlays //Assuming you had programatically created a bunch of overlays
//and added them via configuration //and added them via configuration
@ -1121,9 +1130,7 @@ function scheduleUpdate( viewer, updateFunc, prevUpdateTime ){
deltaTime; deltaTime;
if ( THIS[ viewer.hash ].animating ) { if ( THIS[ viewer.hash ].animating ) {
return $.requestAnimationFrame( function(){ return $.requestAnimationFrame( updateFunc );
updateFunc( viewer );
} );
} }
currentTime = +new Date(); currentTime = +new Date();
@ -1132,9 +1139,7 @@ function scheduleUpdate( viewer, updateFunc, prevUpdateTime ){
targetTime = prevUpdateTime + 1000 / 60; targetTime = prevUpdateTime + 1000 / 60;
deltaTime = Math.max( 1, targetTime - currentTime ); deltaTime = Math.max( 1, targetTime - currentTime );
return $.requestAnimationFrame( function(){ return $.requestAnimationFrame( updateFunc );
updateFunc( viewer );
} );
} }
@ -1334,17 +1339,19 @@ function onContainerEnter( tracker, position, buttonDownElement, buttonDownAny )
// Page update routines ( aka Views - for future reference ) // Page update routines ( aka Views - for future reference )
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
function updateMulti( viewer ) { function updateMulti( viewer, closeCount ) {
var beginTime; var beginTime;
if ( !viewer.source ) { if ( closeCount !== THIS[ viewer.hash ].closeCount ) {
return; return;
} }
beginTime = +new Date(); beginTime = +new Date();
updateOnce( viewer ); updateOnce( viewer );
scheduleUpdate( viewer, arguments.callee, beginTime ); scheduleUpdate( viewer, function(){
updateMulti( viewer, closeCount );
}, beginTime );
} }
function updateOnce( viewer ) { function updateOnce( viewer ) {