mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2025-01-31 15:12:07 +03:00
Code Issues Projects Releases Wiki Activity

Exposing _updateRequestId as a semi-private member for testing purposes

Browse Source
This commit is contained in:
Ian Gilman 2013-06-18 11:06:43 -07:00
parent e99c126a85
commit 713fad4224
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/viewer.js
View File

@ -151,7 +151,6 @@ $.Viewer = function( options ) {
THIS[ this.hash ] = {
"fsBoundsDelta": new $.Point( 1, 1 ),
"prevContainerSize": null,
"updateRequestId": null,
"animating": false,
"forceRedraw": false,
"mouseInside": false,
@ -168,6 +167,8 @@ $.Viewer = function( options ) {
"onfullscreenchange": null
};
this._updateRequestId = null;
//Inherit some behaviors and properties
$.EventHandler.call( this );
$.ControlDock.call( this, options );
@ -465,9 +466,9 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype,
* @return {OpenSeadragon.Viewer} Chainable.
*/
close: function ( ) {
if ( THIS[ this.hash ].updateRequestId !== null ){
$.cancelAnimationFrame( THIS[ this.hash ].updateRequestId );
THIS[ this.hash ].updateRequestId = null;
if ( this._updateRequestId !== null ) {
$.cancelAnimationFrame( this._updateRequestId );
this._updateRequestId = null;
}
if ( this.navigator ) {
@ -1195,7 +1196,7 @@ function openTileSource( viewer, source ) {
THIS[ _this.hash ].animating = false;
THIS[ _this.hash ].forceRedraw = true;
THIS[ _this.hash ].updateRequestId = scheduleUpdate( _this, updateMulti );
_this._updateRequestId = scheduleUpdate( _this, updateMulti );
//Assuming you had programatically created a bunch of overlays
//and added them via configuration
@ -1468,7 +1469,7 @@ function updateMulti( viewer ) {
var beginTime;
if ( !viewer.source ) {
THIS[ viewer.hash ].updateRequestId = null;
viewer._updateRequestId = null;
return;
}
@ -1477,7 +1478,7 @@ function updateMulti( viewer ) {
// Request the next frame, unless we've been closed during the updateOnce()
if ( viewer.source ) {
THIS[ viewer.hash ].updateRequestId = scheduleUpdate( viewer,
viewer._updateRequestId = scheduleUpdate( viewer,
arguments.callee, beginTime );
}
}