Built recent commit

This commit is contained in:
Ian Gilman 2013-01-29 09:37:06 -08:00
parent 7a55b6cf77
commit bd474d32a7

View File

@ -1,3 +1,5 @@
/*globals OpenSeadragon */
/** /**
* @version OpenSeadragon 0.9.90 * @version OpenSeadragon 0.9.90
* *
@ -239,7 +241,7 @@
* *
* @returns {OpenSeadragon.Viewer} * @returns {OpenSeadragon.Viewer}
*/ */
OpenSeadragon = window.OpenSeadragon || function( options ){ window.OpenSeadragon = window.OpenSeadragon || function( options ){
return new OpenSeadragon.Viewer( options ); return new OpenSeadragon.Viewer( options );
@ -1868,6 +1870,7 @@ OpenSeadragon = window.OpenSeadragon || function( options ){
}( OpenSeadragon )); }( OpenSeadragon ));
/*globals OpenSeadragon */
(function($){ (function($){
@ -1955,7 +1958,7 @@ $.EventHandler.prototype = {
if ( handler ) { if ( handler ) {
if ( !eventArgs ) { if ( !eventArgs ) {
eventArgs = new Object(); eventArgs = {};
} }
handler( this, eventArgs ); handler( this, eventArgs );
@ -1964,6 +1967,7 @@ $.EventHandler.prototype = {
}; };
}( OpenSeadragon )); }( OpenSeadragon ));
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){
@ -2286,7 +2290,7 @@ $.EventHandler.prototype = {
delegate.tracking = true; delegate.tracking = true;
ACTIVE[ tracker.hash ] = tracker; ACTIVE[ tracker.hash ] = tracker;
} }
}; }
/** /**
* Stops tracking mouse events on this element. * Stops tracking mouse events on this element.
@ -2321,7 +2325,7 @@ $.EventHandler.prototype = {
delegate.tracking = false; delegate.tracking = false;
delete ACTIVE[ tracker.hash ]; delete ACTIVE[ tracker.hash ];
} }
}; }
/** /**
* @private * @private
@ -2329,7 +2333,7 @@ $.EventHandler.prototype = {
*/ */
function hasMouse( tracker ) { function hasMouse( tracker ) {
return THIS[ tracker.hash ].insideElement; return THIS[ tracker.hash ].insideElement;
}; }
/** /**
* Begin capturing mouse events on this element. * Begin capturing mouse events on this element.
@ -2375,7 +2379,7 @@ $.EventHandler.prototype = {
} }
delegate.capturing = true; delegate.capturing = true;
} }
}; }
/** /**
@ -2422,7 +2426,7 @@ $.EventHandler.prototype = {
} }
delegate.capturing = false; delegate.capturing = false;
} }
}; }
/** /**
@ -2436,7 +2440,7 @@ $.EventHandler.prototype = {
handler( ACTIVE[ otherHash ], event ); handler( ACTIVE[ otherHash ], event );
} }
} }
}; }
/** /**
@ -2455,7 +2459,7 @@ $.EventHandler.prototype = {
$.cancelEvent( event ); $.cancelEvent( event );
} }
} }
}; }
/** /**
@ -2474,7 +2478,7 @@ $.EventHandler.prototype = {
$.cancelEvent( event ); $.cancelEvent( event );
} }
} }
}; }
/** /**
@ -2494,7 +2498,7 @@ $.EventHandler.prototype = {
$.cancelEvent( event ); $.cancelEvent( event );
} }
} }
}; }
/** /**
@ -2541,7 +2545,7 @@ $.EventHandler.prototype = {
$.cancelEvent( event ); $.cancelEvent( event );
} }
} }
}; }
/** /**
@ -2588,7 +2592,7 @@ $.EventHandler.prototype = {
$.cancelEvent( event ); $.cancelEvent( event );
} }
} }
}; }
/** /**
@ -2634,7 +2638,7 @@ $.EventHandler.prototype = {
// add us to the list // add us to the list
CAPTURING.push( tracker ); CAPTURING.push( tracker );
} }
}; }
/** /**
* @private * @private
@ -2664,7 +2668,7 @@ $.EventHandler.prototype = {
} }
event.preventDefault(); event.preventDefault();
}; }
/** /**
@ -2701,7 +2705,7 @@ $.EventHandler.prototype = {
if ( insideElementPress && insideElementRelease ) { if ( insideElementPress && insideElementRelease ) {
handleMouseClick( tracker, event ); handleMouseClick( tracker, event );
} }
}; }
/** /**
@ -2723,7 +2727,7 @@ $.EventHandler.prototype = {
//$.console.debug("pinch end"); //$.console.debug("pinch end");
} }
event.preventDefault(); event.preventDefault();
}; }
/** /**
@ -2760,7 +2764,7 @@ $.EventHandler.prototype = {
); );
$.stopEvent( event ); $.stopEvent( event );
}; }
/** /**
@ -2777,7 +2781,7 @@ $.EventHandler.prototype = {
onMouseUp( tracker, event ); onMouseUp( tracker, event );
} }
releaseMouse( tracker ); releaseMouse( tracker );
}; }
/** /**
@ -2788,7 +2792,7 @@ $.EventHandler.prototype = {
if ( tracker.clickHandler ) { if ( tracker.clickHandler ) {
$.cancelEvent( event ); $.cancelEvent( event );
} }
}; }
/** /**
@ -2827,7 +2831,7 @@ $.EventHandler.prototype = {
$.cancelEvent( event ); $.cancelEvent( event );
} }
} }
}; }
/** /**
@ -2860,7 +2864,7 @@ $.EventHandler.prototype = {
$.cancelEvent( event ); $.cancelEvent( event );
} }
} }
}; }
/** /**
@ -2887,7 +2891,7 @@ $.EventHandler.prototype = {
$.cancelEvent( event ); $.cancelEvent( event );
} }
} }
}; }
/** /**
@ -2931,7 +2935,7 @@ $.EventHandler.prototype = {
} }
} }
event.preventDefault(); event.preventDefault();
}; }
/** /**
* Only triggered once by the deepest element that initially received * Only triggered once by the deepest element that initially received
@ -2949,7 +2953,7 @@ $.EventHandler.prototype = {
} }
$.stopEvent( event ); $.stopEvent( event );
}; }
/** /**
* @private * @private
@ -2957,7 +2961,7 @@ $.EventHandler.prototype = {
*/ */
function getMouseAbsolute( event ) { function getMouseAbsolute( event ) {
return $.getMousePosition( event ); return $.getMousePosition( event );
}; }
/** /**
* @private * @private
@ -2968,7 +2972,7 @@ $.EventHandler.prototype = {
offset = $.getElementPosition( element ); offset = $.getElementPosition( element );
return mouse.minus( offset ); return mouse.minus( offset );
}; }
/** /**
* @private * @private
@ -2985,7 +2989,7 @@ $.EventHandler.prototype = {
} }
} }
return elementA == elementB; return elementA == elementB;
}; }
/** /**
* @private * @private
@ -2993,7 +2997,7 @@ $.EventHandler.prototype = {
*/ */
function onGlobalMouseDown() { function onGlobalMouseDown() {
IS_BUTTON_DOWN = true; IS_BUTTON_DOWN = true;
}; }
/** /**
* @private * @private
@ -3001,7 +3005,7 @@ $.EventHandler.prototype = {
*/ */
function onGlobalMouseUp() { function onGlobalMouseUp() {
IS_BUTTON_DOWN = false; IS_BUTTON_DOWN = false;
}; }
(function () { (function () {
@ -3015,6 +3019,7 @@ $.EventHandler.prototype = {
})(); })();
}( OpenSeadragon )); }( OpenSeadragon ));
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){
@ -3120,6 +3125,8 @@ $.Control.prototype = {
}; };
}( OpenSeadragon )); }( OpenSeadragon ));
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){
//id hash for private properties; //id hash for private properties;
@ -3177,8 +3184,8 @@ $.Control.prototype = {
* @function * @function
*/ */
addControl: function ( element, anchor ) { addControl: function ( element, anchor ) {
var element = $.getElement( element ), element = $.getElement( element );
div = null; var div = null;
if ( getControlIndex( this, element ) >= 0 ) { if ( getControlIndex( this, element ) >= 0 ) {
return; // they're trying to add a duplicate control return; // they're trying to add a duplicate control
@ -3209,8 +3216,8 @@ $.Control.prototype = {
element.style.paddingLeft = "0px"; element.style.paddingLeft = "0px";
element.style.paddingTop = "0px"; element.style.paddingTop = "0px";
break; break;
case $.ControlAnchor.NONE:
default: default:
case $.ControlAnchor.NONE:
div = this.container; div = this.container;
element.style.margin = "0px"; element.style.margin = "0px";
element.style.padding = "0px"; element.style.padding = "0px";
@ -3229,8 +3236,8 @@ $.Control.prototype = {
* @return {OpenSeadragon.ControlDock} Chainable. * @return {OpenSeadragon.ControlDock} Chainable.
*/ */
removeControl: function ( element ) { removeControl: function ( element ) {
var element = $.getElement( element ), element = $.getElement( element );
i = getControlIndex( this, element ); var i = getControlIndex( this, element );
if ( i >= 0 ) { if ( i >= 0 ) {
this.controls[ i ].destroy(); this.controls[ i ].destroy();
@ -3301,9 +3308,11 @@ $.Control.prototype = {
} }
return -1; return -1;
}; }
}( OpenSeadragon ));(function( $ ){ }( OpenSeadragon ));/*globals OpenSeadragon */
(function( $ ){
// dictionary from hash to private properties // dictionary from hash to private properties
var THIS = {}, var THIS = {},
@ -3880,7 +3889,7 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype,
abortControlsAutoHide( this ); abortControlsAutoHide( this );
} else { } else {
beginControlsAutoHide( this ); beginControlsAutoHide( this );
}; }
}, },
@ -4363,7 +4372,7 @@ function scheduleUpdate( viewer, updateFunc, prevUpdateTime ){
return window.setTimeout( function(){ return window.setTimeout( function(){
updateFunc( viewer ); updateFunc( viewer );
}, deltaTime ); }, deltaTime );
}; }
//provides a sequence in the fade animation //provides a sequence in the fade animation
@ -4371,7 +4380,7 @@ function scheduleControlsFade( viewer ) {
window.setTimeout( function(){ window.setTimeout( function(){
updateControlsFade( viewer ); updateControlsFade( viewer );
}, 20); }, 20);
}; }
//initiates an animation to hide the controls //initiates an animation to hide the controls
@ -4387,7 +4396,7 @@ function beginControlsAutoHide( viewer ) {
window.setTimeout( function(){ window.setTimeout( function(){
scheduleControlsFade( viewer ); scheduleControlsFade( viewer );
}, viewer.controlsFadeDelay ); }, viewer.controlsFadeDelay );
}; }
//determines if fade animation is done or continues the animation //determines if fade animation is done or continues the animation
@ -4413,7 +4422,7 @@ function updateControlsFade( viewer ) {
scheduleControlsFade( viewer ); scheduleControlsFade( viewer );
} }
} }
}; }
//stop the fade animation on the controls and show them //stop the fade animation on the controls and show them
@ -4423,7 +4432,7 @@ function abortControlsAutoHide( viewer ) {
for ( i = viewer.controls.length - 1; i >= 0; i-- ) { for ( i = viewer.controls.length - 1; i >= 0; i-- ) {
viewer.controls[ i ].setOpacity( 1.0 ); viewer.controls[ i ].setOpacity( 1.0 );
} }
}; }
@ -4432,12 +4441,12 @@ function abortControlsAutoHide( viewer ) {
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
function onFocus(){ function onFocus(){
abortControlsAutoHide( this ); abortControlsAutoHide( this );
}; }
function onBlur(){ function onBlur(){
beginControlsAutoHide( this ); beginControlsAutoHide( this );
}; }
function onCanvasClick( tracker, position, quick, shift ) { function onCanvasClick( tracker, position, quick, shift ) {
var zoomPreClick, var zoomPreClick,
@ -4451,7 +4460,7 @@ function onCanvasClick( tracker, position, quick, shift ) {
); );
this.viewport.applyConstraints(); this.viewport.applyConstraints();
} }
}; }
function onCanvasDrag( tracker, position, delta, shift ) { function onCanvasDrag( tracker, position, delta, shift ) {
if ( this.viewport ) { if ( this.viewport ) {
@ -4467,13 +4476,13 @@ function onCanvasDrag( tracker, position, delta, shift ) {
) )
); );
} }
}; }
function onCanvasRelease( tracker, position, insideElementPress, insideElementRelease ) { function onCanvasRelease( tracker, position, insideElementPress, insideElementRelease ) {
if ( insideElementPress && this.viewport ) { if ( insideElementPress && this.viewport ) {
this.viewport.applyConstraints(); this.viewport.applyConstraints();
} }
}; }
function onCanvasScroll( tracker, position, scroll, shift ) { function onCanvasScroll( tracker, position, scroll, shift ) {
var factor; var factor;
@ -4487,7 +4496,7 @@ function onCanvasScroll( tracker, position, scroll, shift ) {
} }
//cancels event //cancels event
return false; return false;
}; }
function onContainerExit( tracker, position, buttonDownElement, buttonDownAny ) { function onContainerExit( tracker, position, buttonDownElement, buttonDownAny ) {
if ( !buttonDownElement ) { if ( !buttonDownElement ) {
@ -4496,7 +4505,7 @@ function onContainerExit( tracker, position, buttonDownElement, buttonDownAny )
beginControlsAutoHide( this ); beginControlsAutoHide( this );
} }
} }
}; }
function onContainerRelease( tracker, position, insideElementPress, insideElementRelease ) { function onContainerRelease( tracker, position, insideElementPress, insideElementRelease ) {
if ( !insideElementRelease ) { if ( !insideElementRelease ) {
@ -4505,12 +4514,12 @@ function onContainerRelease( tracker, position, insideElementPress, insideElemen
beginControlsAutoHide( this ); beginControlsAutoHide( this );
} }
} }
}; }
function onContainerEnter( tracker, position, buttonDownElement, buttonDownAny ) { function onContainerEnter( tracker, position, buttonDownElement, buttonDownAny ) {
THIS[ this.hash ].mouseInside = true; THIS[ this.hash ].mouseInside = true;
abortControlsAutoHide( this ); abortControlsAutoHide( this );
}; }
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@ -4528,7 +4537,7 @@ function updateMulti( viewer ) {
beginTime = +new Date(); beginTime = +new Date();
updateOnce( viewer ); updateOnce( viewer );
scheduleUpdate( viewer, arguments.callee, beginTime ); scheduleUpdate( viewer, arguments.callee, beginTime );
}; }
function updateOnce( viewer ) { function updateOnce( viewer ) {
@ -4585,7 +4594,7 @@ function updateOnce( viewer ) {
THIS[ viewer.hash ].animating = animated; THIS[ viewer.hash ].animating = animated;
//viewer.profiler.endUpdate(); //viewer.profiler.endUpdate();
}; }
@ -4594,7 +4603,7 @@ function updateOnce( viewer ) {
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
function resolveUrl( prefix, url ) { function resolveUrl( prefix, url ) {
return prefix ? prefix + url : url; return prefix ? prefix + url : url;
}; }
@ -4603,7 +4612,7 @@ function beginZoomingIn() {
THIS[ this.hash ].zoomFactor = this.zoomPerSecond; THIS[ this.hash ].zoomFactor = this.zoomPerSecond;
THIS[ this.hash ].zooming = true; THIS[ this.hash ].zooming = true;
scheduleZoom( this ); scheduleZoom( this );
}; }
function beginZoomingOut() { function beginZoomingOut() {
@ -4611,17 +4620,17 @@ function beginZoomingOut() {
THIS[ this.hash ].zoomFactor = 1.0 / this.zoomPerSecond; THIS[ this.hash ].zoomFactor = 1.0 / this.zoomPerSecond;
THIS[ this.hash ].zooming = true; THIS[ this.hash ].zooming = true;
scheduleZoom( this ); scheduleZoom( this );
}; }
function endZooming() { function endZooming() {
THIS[ this.hash ].zooming = false; THIS[ this.hash ].zooming = false;
}; }
function scheduleZoom( viewer ) { function scheduleZoom( viewer ) {
window.setTimeout( $.delegate( viewer, doZoom ), 10 ); window.setTimeout( $.delegate( viewer, doZoom ), 10 );
}; }
function doZoom() { function doZoom() {
@ -4639,7 +4648,7 @@ function doZoom() {
THIS[ this.hash ].lastZoomTime = currentTime; THIS[ this.hash ].lastZoomTime = currentTime;
scheduleZoom( this ); scheduleZoom( this );
} }
}; }
function doSingleZoomIn() { function doSingleZoomIn() {
@ -4650,7 +4659,7 @@ function doSingleZoomIn() {
); );
this.viewport.applyConstraints(); this.viewport.applyConstraints();
} }
}; }
function doSingleZoomOut() { function doSingleZoomOut() {
@ -4661,20 +4670,20 @@ function doSingleZoomOut() {
); );
this.viewport.applyConstraints(); this.viewport.applyConstraints();
} }
}; }
function lightUp() { function lightUp() {
this.buttons.emulateEnter(); this.buttons.emulateEnter();
this.buttons.emulateExit(); this.buttons.emulateExit();
}; }
function onHome() { function onHome() {
if ( this.viewport ) { if ( this.viewport ) {
this.viewport.goHome(); this.viewport.goHome();
} }
}; }
function onFullPage() { function onFullPage() {
@ -4687,22 +4696,24 @@ function onFullPage() {
if ( this.viewport ) { if ( this.viewport ) {
this.viewport.applyConstraints(); this.viewport.applyConstraints();
} }
}; }
function onPrevious(){ function onPrevious(){
var previous = THIS[ this.hash ].sequence - 1; var previous = THIS[ this.hash ].sequence - 1;
this.goToPage( previous ); this.goToPage( previous );
}; }
function onNext(){ function onNext(){
var next = THIS[ this.hash ].sequence + 1; var next = THIS[ this.hash ].sequence + 1;
this.goToPage( next ); this.goToPage( next );
}; }
}( OpenSeadragon )); }( OpenSeadragon ));
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){
/** /**
@ -4833,16 +4844,18 @@ $.Navigator = function( options ){
case 119://w case 119://w
case 87://W case 87://W
case 38://up arrow case 38://up arrow
shiftKey ? if (shiftKey)
_this.viewer.viewport.zoomBy(1.1): _this.viewer.viewport.zoomBy(1.1);
else
_this.viewer.viewport.panBy(new $.Point(0, -0.05)); _this.viewer.viewport.panBy(new $.Point(0, -0.05));
_this.viewer.viewport.applyConstraints(); _this.viewer.viewport.applyConstraints();
return false; return false;
case 115://s case 115://s
case 83://S case 83://S
case 40://down arrow case 40://down arrow
shiftKey ? if (shiftKey)
_this.viewer.viewport.zoomBy(0.9): _this.viewer.viewport.zoomBy(0.9);
else
_this.viewer.viewport.panBy(new $.Point(0, 0.05)); _this.viewer.viewport.panBy(new $.Point(0, 0.05));
_this.viewer.viewport.applyConstraints(); _this.viewer.viewport.applyConstraints();
return false; return false;
@ -4936,7 +4949,7 @@ $.extend( $.Navigator.prototype, $.EventHandler.prototype, $.Viewer.prototype, {
*/ */
function onCanvasClick( tracker, position, quick, shift ) { function onCanvasClick( tracker, position, quick, shift ) {
this.displayRegion.focus(); this.displayRegion.focus();
}; }
/** /**
@ -4958,7 +4971,7 @@ function onCanvasDrag( tracker, position, delta, shift ) {
) )
); );
} }
}; }
/** /**
@ -4970,7 +4983,7 @@ function onCanvasRelease( tracker, position, insideElementPress, insideElementRe
if ( insideElementPress && this.viewer.viewport ) { if ( insideElementPress && this.viewer.viewport ) {
this.viewer.viewport.applyConstraints(); this.viewer.viewport.applyConstraints();
} }
}; }
/** /**
@ -4991,7 +5004,7 @@ function onCanvasScroll( tracker, position, scroll, shift ) {
} }
//cancels event //cancels event
return false; return false;
}; }
}( OpenSeadragon )); }( OpenSeadragon ));
@ -5086,6 +5099,7 @@ $.extend( $, {
}); });
}( OpenSeadragon )); }( OpenSeadragon ));
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){
@ -5228,6 +5242,7 @@ $.Point.prototype = {
}; };
}( OpenSeadragon )); }( OpenSeadragon ));
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){
@ -5606,7 +5621,7 @@ function processResponse( xhr ){
data = responseText; data = responseText;
} }
return data; return data;
}; }
/** /**
@ -5965,6 +5980,7 @@ function configureFromObject( tileSource, configuration ){
}; };
}( OpenSeadragon )); }( OpenSeadragon ));
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){
@ -6159,7 +6175,7 @@ function filterFiles( files ){
return a.height - b.height; return a.height - b.height;
}); });
}; }
/** /**
* @private * @private
@ -6193,8 +6209,8 @@ function configureFromXML( tileSource, xmlDoc ){
conf.levels .push({ conf.levels .push({
url: level.getAttribute( "url" ), url: level.getAttribute( "url" ),
width: parseInt( level.getAttribute( "width" ) ), width: parseInt( level.getAttribute( "width" ), 10 ),
height: parseInt( level.getAttribute( "height" ) ) height: parseInt( level.getAttribute( "height" ), 10 )
}); });
} }
@ -6212,7 +6228,7 @@ function configureFromXML( tileSource, xmlDoc ){
} }
throw new Error( 'Unknown element ' + rootName ); throw new Error( 'Unknown element ' + rootName );
}; }
/** /**
* @private * @private
@ -6223,9 +6239,10 @@ function configureFromObject( tileSource, configuration ){
return configuration.levels; return configuration.levels;
}; }
}( OpenSeadragon )); }( OpenSeadragon ));
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){
@ -6337,7 +6354,7 @@ $.extend( $.TileSourceCollection.prototype, $.TileSource.prototype, {
}( OpenSeadragon )); }( OpenSeadragon ));
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){
@ -6586,7 +6603,7 @@ function scheduleFade( button ) {
window.setTimeout(function(){ window.setTimeout(function(){
updateFade( button ); updateFade( button );
}, 20 ); }, 20 );
}; }
function updateFade( button ) { function updateFade( button ) {
var currentTime, var currentTime,
@ -6608,7 +6625,7 @@ function updateFade( button ) {
scheduleFade( button ); scheduleFade( button );
} }
} }
}; }
function beginFading( button ) { function beginFading( button ) {
button.shouldFade = true; button.shouldFade = true;
@ -6616,14 +6633,14 @@ function beginFading( button ) {
window.setTimeout( function(){ window.setTimeout( function(){
scheduleFade( button ); scheduleFade( button );
}, button.fadeDelay ); }, button.fadeDelay );
}; }
function stopFading( button ) { function stopFading( button ) {
button.shouldFade = false; button.shouldFade = false;
if( button.imgGroup ){ if( button.imgGroup ){
$.setElementOpacity( button.imgGroup, 1.0, true ); $.setElementOpacity( button.imgGroup, 1.0, true );
} }
}; }
function inTo( button, newState ) { function inTo( button, newState ) {
@ -6652,7 +6669,7 @@ function inTo( button, newState ) {
} }
button.currentState = $.ButtonState.DOWN; button.currentState = $.ButtonState.DOWN;
} }
}; }
function outTo( button, newState ) { function outTo( button, newState ) {
@ -6682,11 +6699,12 @@ function outTo( button, newState ) {
beginFading( button ); beginFading( button );
button.currentState = $.ButtonState.REST; button.currentState = $.ButtonState.REST;
} }
}; }
}( OpenSeadragon )); }( OpenSeadragon ));
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){
/** /**
@ -6797,6 +6815,7 @@ $.ButtonGroup.prototype = {
}( OpenSeadragon )); }( OpenSeadragon ));
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){
@ -7434,7 +7453,8 @@ function onKeyPress( tracker, keyCode, shiftKey ){
}( OpenSeadragon )); }( OpenSeadragon ));/*globals OpenSeadragon */
(function( $ ){ (function( $ ){
/** /**
@ -7457,11 +7477,12 @@ $.DisplayRect = function( x, y, width, height, minLevel, maxLevel ) {
this.minLevel = minLevel; this.minLevel = minLevel;
this.maxLevel = maxLevel; this.maxLevel = maxLevel;
} };
$.extend( $.DisplayRect.prototype, $.Rect.prototype ); $.extend( $.DisplayRect.prototype, $.Rect.prototype );
}( OpenSeadragon )); }( OpenSeadragon ));
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){
@ -7569,7 +7590,7 @@ $.Spring.prototype = {
( this.target.time - this.start.time ) ( this.target.time - this.start.time )
); );
} }
} };
/** /**
* @private * @private
@ -7577,9 +7598,10 @@ $.Spring.prototype = {
function transform( stiffness, x ) { function transform( stiffness, x ) {
return ( 1.0 - Math.exp( stiffness * -x ) ) / return ( 1.0 - Math.exp( stiffness * -x ) ) /
( 1.0 - Math.exp( -stiffness ) ); ( 1.0 - Math.exp( -stiffness ) );
}; }
}( OpenSeadragon )); }( OpenSeadragon ));
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){
@ -7732,6 +7754,7 @@ $.Tile.prototype = {
}; };
}( OpenSeadragon )); }( OpenSeadragon ));
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){
@ -7816,8 +7839,8 @@ $.Tile.prototype = {
case $.OverlayPlacement.LEFT: case $.OverlayPlacement.LEFT:
position.y -= size.y / 2; position.y -= size.y / 2;
break; break;
case $.OverlayPlacement.CENTER:
default: default:
case $.OverlayPlacement.CENTER:
position.x -= size.x / 2; position.x -= size.x / 2;
position.y -= size.y / 2; position.y -= size.y / 2;
break; break;
@ -7904,6 +7927,7 @@ $.Tile.prototype = {
}; };
}( OpenSeadragon )); }( OpenSeadragon ));
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){
@ -8386,7 +8410,7 @@ function updateViewport( drawer ) {
// because we haven't finished drawing, so // because we haven't finished drawing, so
drawer.updateAgain = true; drawer.updateAgain = true;
} }
}; }
function updateLevel( drawer, haveDrawn, level, levelOpacity, levelVisibility, viewportTL, viewportBR, currentTime, best ){ function updateLevel( drawer, haveDrawn, level, levelOpacity, levelVisibility, viewportTL, viewportBR, currentTime, best ){
@ -8432,7 +8456,7 @@ function updateLevel( drawer, haveDrawn, level, levelOpacity, levelVisibility, v
} }
} }
return best; return best;
}; }
function updateTile( drawer, drawLevel, haveDrawn, x, y, level, levelOpacity, levelVisibility, viewportCenter, numberOfTiles, currentTime, best){ function updateTile( drawer, drawLevel, haveDrawn, x, y, level, levelOpacity, levelVisibility, viewportCenter, numberOfTiles, currentTime, best){
@ -8492,7 +8516,7 @@ function updateTile( drawer, drawLevel, haveDrawn, x, y, level, levelOpacity, le
} }
return best; return best;
}; }
function getTile( x, y, level, tileSource, tilesMatrix, time, numTiles, normHeight ) { function getTile( x, y, level, tileSource, tilesMatrix, time, numTiles, normHeight ) {
var xMod, var xMod,
@ -8533,7 +8557,7 @@ function getTile( x, y, level, tileSource, tilesMatrix, time, numTiles, normHeig
tile.lastTouchTime = time; tile.lastTouchTime = time;
return tile; return tile;
}; }
function loadTile( drawer, tile, time ) { function loadTile( drawer, tile, time ) {
@ -8543,7 +8567,7 @@ function loadTile( drawer, tile, time ) {
onTileLoad( drawer, tile, time, image ); onTileLoad( drawer, tile, time, image );
} }
); );
}; }
function onTileLoad( drawer, tile, time, image ) { function onTileLoad( drawer, tile, time, image ) {
var insertionIndex, var insertionIndex,
@ -8613,7 +8637,7 @@ function onTileLoad( drawer, tile, time, image ) {
drawer.tilesLoaded[ insertionIndex ] = tile; drawer.tilesLoaded[ insertionIndex ] = tile;
drawer.updateAgain = true; drawer.updateAgain = true;
}; }
function positionTile( tile, overlap, viewport, viewportCenter, levelVisibility ){ function positionTile( tile, overlap, viewport, viewportCenter, levelVisibility ){
@ -8634,7 +8658,7 @@ function positionTile( tile, overlap, viewport, viewportCenter, levelVisibility
tile.size = sizeC; tile.size = sizeC;
tile.distance = tileDistance; tile.distance = tileDistance;
tile.visibility = levelVisibility; tile.visibility = levelVisibility;
}; }
function blendTile( drawer, tile, x, y, level, levelOpacity, currentTime ){ function blendTile( drawer, tile, x, y, level, levelOpacity, currentTime ){
@ -8664,13 +8688,13 @@ function blendTile( drawer, tile, x, y, level, levelOpacity, currentTime ){
} }
return false; return false;
}; }
function clearTiles( drawer ) { function clearTiles( drawer ) {
drawer.tilesMatrix = {}; drawer.tilesMatrix = {};
drawer.tilesLoaded = []; drawer.tilesLoaded = [];
}; }
/** /**
* @private * @private
@ -8713,7 +8737,7 @@ function providesCoverage( coverage, level, x, y ) {
coverage[ level ][ x ][ y ] === undefined || coverage[ level ][ x ][ y ] === undefined ||
coverage[ level ][ x ][ y ] === true coverage[ level ][ x ][ y ] === true
); );
}; }
/** /**
* @private * @private
@ -8733,7 +8757,7 @@ function isCovered( coverage, level, x, y ) {
providesCoverage( coverage, level + 1, 2 * x + 1, 2 * y + 1 ) providesCoverage( coverage, level + 1, 2 * x + 1, 2 * y + 1 )
); );
} }
}; }
/** /**
* @private * @private
@ -8754,7 +8778,7 @@ function setCoverage( coverage, level, x, y, covers ) {
} }
coverage[ level ][ x ][ y ] = covers; coverage[ level ][ x ][ y ] = covers;
}; }
/** /**
* @private * @private
@ -8765,7 +8789,7 @@ function setCoverage( coverage, level, x, y, covers ) {
*/ */
function resetCoverage( coverage, level ) { function resetCoverage( coverage, level ) {
coverage[ level ] = {}; coverage[ level ] = {};
}; }
/** /**
* @private * @private
@ -8782,7 +8806,7 @@ function getOverlayIndex( overlays, element ) {
} }
return -1; return -1;
}; }
/** /**
* @private * @private
@ -8804,7 +8828,7 @@ function compareTiles( previousBest, tile ) {
} }
return previousBest; return previousBest;
}; }
function finishLoadingImage( image, callback, successful, jobid ){ function finishLoadingImage( image, callback, successful, jobid ){
@ -8819,7 +8843,7 @@ function finishLoadingImage( image, callback, successful, jobid ){
callback( image.src, successful ? image : null); callback( image.src, successful ? image : null);
}, 1 ); }, 1 );
}; }
function drawOverlays( viewport, overlays, container ){ function drawOverlays( viewport, overlays, container ){
@ -8828,7 +8852,7 @@ function drawOverlays( viewport, overlays, container ){
for ( i = 0; i < length; i++ ) { for ( i = 0; i < length; i++ ) {
drawOverlay( viewport, overlays[ i ], container ); drawOverlay( viewport, overlays[ i ], container );
} }
}; }
function drawOverlay( viewport, overlay, container ){ function drawOverlay( viewport, overlay, container ){
@ -8841,7 +8865,7 @@ function drawOverlay( viewport, overlay, container ){
true true
); );
overlay.drawHTML( container ); overlay.drawHTML( container );
}; }
function drawTiles( drawer, lastDrawn ){ function drawTiles( drawer, lastDrawn ){
var i, var i,
@ -8929,7 +8953,7 @@ function drawTiles( drawer, lastDrawn ){
tile.beingDrawn = true; tile.beingDrawn = true;
} }
} }
}; }
function drawDebugInfo( drawer, tile, count, i ){ function drawDebugInfo( drawer, tile, count, i ){
@ -8988,10 +9012,11 @@ function drawDebugInfo( drawer, tile, count, i ){
tile.position.y + 70 tile.position.y + 70
); );
} }
}; }
}( OpenSeadragon )); }( OpenSeadragon ));
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){