JS Hint work (mostly semicolons at this point)

This commit is contained in:
Ian Gilman 2013-01-29 09:32:58 -08:00
parent 624fbd97b9
commit 7a55b6cf77
21 changed files with 137 additions and 111 deletions

View File

@ -1,4 +1,4 @@
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){
@ -247,7 +247,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,
@ -269,7 +269,7 @@ function updateFade( button ) {
scheduleFade( button ); scheduleFade( button );
} }
} }
}; }
function beginFading( button ) { function beginFading( button ) {
button.shouldFade = true; button.shouldFade = true;
@ -277,14 +277,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 ) {
@ -313,7 +313,7 @@ function inTo( button, newState ) {
} }
button.currentState = $.ButtonState.DOWN; button.currentState = $.ButtonState.DOWN;
} }
}; }
function outTo( button, newState ) { function outTo( button, newState ) {
@ -343,7 +343,7 @@ function outTo( button, newState ) {
beginFading( button ); beginFading( button );
button.currentState = $.ButtonState.REST; button.currentState = $.ButtonState.REST;
} }
}; }

View File

@ -1,3 +1,4 @@
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){
/** /**

View File

@ -1,3 +1,4 @@
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){

View File

@ -1,3 +1,5 @@
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){
//id hash for private properties; //id hash for private properties;
@ -55,8 +57,8 @@
* @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
@ -87,8 +89,8 @@
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";
@ -107,8 +109,8 @@
* @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();
@ -179,6 +181,6 @@
} }
return -1; return -1;
}; }
}( OpenSeadragon )); }( OpenSeadragon ));

View File

@ -1,3 +1,4 @@
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){
@ -21,7 +22,7 @@ $.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 );

View File

@ -1,3 +1,4 @@
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){
@ -480,7 +481,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 ){
@ -526,7 +527,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){
@ -586,7 +587,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,
@ -627,7 +628,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 ) {
@ -637,7 +638,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,
@ -707,7 +708,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 ){
@ -728,7 +729,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 ){
@ -758,13 +759,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
@ -807,7 +808,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
@ -827,7 +828,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
@ -848,7 +849,7 @@ function setCoverage( coverage, level, x, y, covers ) {
} }
coverage[ level ][ x ][ y ] = covers; coverage[ level ][ x ][ y ] = covers;
}; }
/** /**
* @private * @private
@ -859,7 +860,7 @@ function setCoverage( coverage, level, x, y, covers ) {
*/ */
function resetCoverage( coverage, level ) { function resetCoverage( coverage, level ) {
coverage[ level ] = {}; coverage[ level ] = {};
}; }
/** /**
* @private * @private
@ -876,7 +877,7 @@ function getOverlayIndex( overlays, element ) {
} }
return -1; return -1;
}; }
/** /**
* @private * @private
@ -898,7 +899,7 @@ function compareTiles( previousBest, tile ) {
} }
return previousBest; return previousBest;
}; }
function finishLoadingImage( image, callback, successful, jobid ){ function finishLoadingImage( image, callback, successful, jobid ){
@ -913,7 +914,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 ){
@ -922,7 +923,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 ){
@ -935,7 +936,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,
@ -1023,7 +1024,7 @@ function drawTiles( drawer, lastDrawn ){
tile.beingDrawn = true; tile.beingDrawn = true;
} }
} }
}; }
function drawDebugInfo( drawer, tile, count, i ){ function drawDebugInfo( drawer, tile, count, i ){
@ -1082,7 +1083,7 @@ function drawDebugInfo( drawer, tile, count, i ){
tile.position.y + 70 tile.position.y + 70
); );
} }
}; }
}( OpenSeadragon )); }( OpenSeadragon ));

View File

@ -1,3 +1,4 @@
/*globals OpenSeadragon */
(function($){ (function($){
@ -85,7 +86,7 @@ $.EventHandler.prototype = {
if ( handler ) { if ( handler ) {
if ( !eventArgs ) { if ( !eventArgs ) {
eventArgs = new Object(); eventArgs = {};
} }
handler( this, eventArgs ); handler( this, eventArgs );

View File

@ -1,3 +1,4 @@
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){
@ -192,7 +193,7 @@ function filterFiles( files ){
return a.height - b.height; return a.height - b.height;
}); });
}; }
/** /**
* @private * @private
@ -226,8 +227,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 )
}); });
} }
@ -245,7 +246,7 @@ function configureFromXML( tileSource, xmlDoc ){
} }
throw new Error( 'Unknown element ' + rootName ); throw new Error( 'Unknown element ' + rootName );
}; }
/** /**
* @private * @private
@ -256,6 +257,6 @@ function configureFromObject( tileSource, configuration ){
return configuration.levels; return configuration.levels;
}; }
}( OpenSeadragon )); }( OpenSeadragon ));

View File

@ -1,3 +1,4 @@
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){
@ -320,7 +321,7 @@
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.
@ -355,7 +356,7 @@
delegate.tracking = false; delegate.tracking = false;
delete ACTIVE[ tracker.hash ]; delete ACTIVE[ tracker.hash ];
} }
}; }
/** /**
* @private * @private
@ -363,7 +364,7 @@
*/ */
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.
@ -409,7 +410,7 @@
} }
delegate.capturing = true; delegate.capturing = true;
} }
}; }
/** /**
@ -456,7 +457,7 @@
} }
delegate.capturing = false; delegate.capturing = false;
} }
}; }
/** /**
@ -470,7 +471,7 @@
handler( ACTIVE[ otherHash ], event ); handler( ACTIVE[ otherHash ], event );
} }
} }
}; }
/** /**
@ -489,7 +490,7 @@
$.cancelEvent( event ); $.cancelEvent( event );
} }
} }
}; }
/** /**
@ -508,7 +509,7 @@
$.cancelEvent( event ); $.cancelEvent( event );
} }
} }
}; }
/** /**
@ -528,7 +529,7 @@
$.cancelEvent( event ); $.cancelEvent( event );
} }
} }
}; }
/** /**
@ -575,7 +576,7 @@
$.cancelEvent( event ); $.cancelEvent( event );
} }
} }
}; }
/** /**
@ -622,7 +623,7 @@
$.cancelEvent( event ); $.cancelEvent( event );
} }
} }
}; }
/** /**
@ -668,7 +669,7 @@
// add us to the list // add us to the list
CAPTURING.push( tracker ); CAPTURING.push( tracker );
} }
}; }
/** /**
* @private * @private
@ -698,7 +699,7 @@
} }
event.preventDefault(); event.preventDefault();
}; }
/** /**
@ -735,7 +736,7 @@
if ( insideElementPress && insideElementRelease ) { if ( insideElementPress && insideElementRelease ) {
handleMouseClick( tracker, event ); handleMouseClick( tracker, event );
} }
}; }
/** /**
@ -757,7 +758,7 @@
//$.console.debug("pinch end"); //$.console.debug("pinch end");
} }
event.preventDefault(); event.preventDefault();
}; }
/** /**
@ -794,7 +795,7 @@
); );
$.stopEvent( event ); $.stopEvent( event );
}; }
/** /**
@ -811,7 +812,7 @@
onMouseUp( tracker, event ); onMouseUp( tracker, event );
} }
releaseMouse( tracker ); releaseMouse( tracker );
}; }
/** /**
@ -822,7 +823,7 @@
if ( tracker.clickHandler ) { if ( tracker.clickHandler ) {
$.cancelEvent( event ); $.cancelEvent( event );
} }
}; }
/** /**
@ -861,7 +862,7 @@
$.cancelEvent( event ); $.cancelEvent( event );
} }
} }
}; }
/** /**
@ -894,7 +895,7 @@
$.cancelEvent( event ); $.cancelEvent( event );
} }
} }
}; }
/** /**
@ -921,7 +922,7 @@
$.cancelEvent( event ); $.cancelEvent( event );
} }
} }
}; }
/** /**
@ -965,7 +966,7 @@
} }
} }
event.preventDefault(); event.preventDefault();
}; }
/** /**
* Only triggered once by the deepest element that initially received * Only triggered once by the deepest element that initially received
@ -983,7 +984,7 @@
} }
$.stopEvent( event ); $.stopEvent( event );
}; }
/** /**
* @private * @private
@ -991,7 +992,7 @@
*/ */
function getMouseAbsolute( event ) { function getMouseAbsolute( event ) {
return $.getMousePosition( event ); return $.getMousePosition( event );
}; }
/** /**
* @private * @private
@ -1002,7 +1003,7 @@
offset = $.getElementPosition( element ); offset = $.getElementPosition( element );
return mouse.minus( offset ); return mouse.minus( offset );
}; }
/** /**
* @private * @private
@ -1019,7 +1020,7 @@
} }
} }
return elementA == elementB; return elementA == elementB;
}; }
/** /**
* @private * @private
@ -1027,7 +1028,7 @@
*/ */
function onGlobalMouseDown() { function onGlobalMouseDown() {
IS_BUTTON_DOWN = true; IS_BUTTON_DOWN = true;
}; }
/** /**
* @private * @private
@ -1035,7 +1036,7 @@
*/ */
function onGlobalMouseUp() { function onGlobalMouseUp() {
IS_BUTTON_DOWN = false; IS_BUTTON_DOWN = false;
}; }
(function () { (function () {

View File

@ -1,3 +1,5 @@
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){
/** /**
@ -128,16 +130,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;
@ -231,7 +235,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();
}; }
/** /**
@ -253,7 +257,7 @@ function onCanvasDrag( tracker, position, delta, shift ) {
) )
); );
} }
}; }
/** /**
@ -265,7 +269,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();
} }
}; }
/** /**
@ -286,7 +290,7 @@ function onCanvasScroll( tracker, position, scroll, shift ) {
} }
//cancels event //cancels event
return false; return false;
}; }
}( OpenSeadragon )); }( OpenSeadragon ));

View File

@ -1,3 +1,5 @@
/*globals OpenSeadragon */
/** /**
* @version OpenSeadragon @VERSION@ * @version OpenSeadragon @VERSION@
* *
@ -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 );

View File

@ -1,3 +1,4 @@
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){
@ -82,8 +83,8 @@
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;

View File

@ -1,3 +1,4 @@
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){

View File

@ -1,3 +1,4 @@
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){

View File

@ -1,3 +1,4 @@
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){

View File

@ -1,3 +1,4 @@
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){
@ -105,7 +106,7 @@ $.Spring.prototype = {
( this.target.time - this.start.time ) ( this.target.time - this.start.time )
); );
} }
} };
/** /**
* @private * @private
@ -113,6 +114,6 @@ $.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 ));

View File

@ -1,3 +1,4 @@
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){

View File

@ -1,3 +1,4 @@
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){
@ -376,7 +377,7 @@ function processResponse( xhr ){
data = responseText; data = responseText;
} }
return data; return data;
}; }
/** /**

View File

@ -1,3 +1,4 @@
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){

View File

@ -1,3 +1,5 @@
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){
// dictionary from hash to private properties // dictionary from hash to private properties
@ -575,7 +577,7 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype,
abortControlsAutoHide( this ); abortControlsAutoHide( this );
} else { } else {
beginControlsAutoHide( this ); beginControlsAutoHide( this );
}; }
}, },
@ -1058,7 +1060,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
@ -1066,7 +1068,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
@ -1082,7 +1084,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
@ -1108,7 +1110,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
@ -1118,7 +1120,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 );
} }
}; }
@ -1127,12 +1129,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,
@ -1146,7 +1148,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 ) {
@ -1162,13 +1164,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;
@ -1182,7 +1184,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 ) {
@ -1191,7 +1193,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 ) {
@ -1200,12 +1202,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 );
}; }
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
@ -1223,7 +1225,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 ) {
@ -1280,7 +1282,7 @@ function updateOnce( viewer ) {
THIS[ viewer.hash ].animating = animated; THIS[ viewer.hash ].animating = animated;
//viewer.profiler.endUpdate(); //viewer.profiler.endUpdate();
}; }
@ -1289,7 +1291,7 @@ function updateOnce( viewer ) {
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
function resolveUrl( prefix, url ) { function resolveUrl( prefix, url ) {
return prefix ? prefix + url : url; return prefix ? prefix + url : url;
}; }
@ -1298,7 +1300,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() {
@ -1306,17 +1308,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() {
@ -1334,7 +1336,7 @@ function doZoom() {
THIS[ this.hash ].lastZoomTime = currentTime; THIS[ this.hash ].lastZoomTime = currentTime;
scheduleZoom( this ); scheduleZoom( this );
} }
}; }
function doSingleZoomIn() { function doSingleZoomIn() {
@ -1345,7 +1347,7 @@ function doSingleZoomIn() {
); );
this.viewport.applyConstraints(); this.viewport.applyConstraints();
} }
}; }
function doSingleZoomOut() { function doSingleZoomOut() {
@ -1356,20 +1358,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() {
@ -1382,19 +1384,19 @@ 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 ));

View File

@ -1,3 +1,4 @@
/*globals OpenSeadragon */
(function( $ ){ (function( $ ){