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

replaced all references of elmt with element ( or Elmt with Element )

Browse Source
This commit is contained in:
thatcher 2012-01-31 21:01:37 -05:00
parent 2410b01943
commit 5cba11c91c
9 changed files with 358 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.properties
View File

@ -6,7 +6,7 @@
PROJECT: openseadragon PROJECT: openseadragon
BUILD_MAJOR: 0 BUILD_MAJOR: 0
BUILD_MINOR: 8 BUILD_MINOR: 8
BUILD_ID: 26 BUILD_ID: 27
BUILD: ${PROJECT}.${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID} BUILD: ${PROJECT}.${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID}
VERSION: ${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID} VERSION: ${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID}

224
openseadragon.js
View File

@ -1,5 +1,5 @@
/** /**
* @version OpenSeadragon 0.8.26 * @version OpenSeadragon 0.8.27
* *
* @fileOverview * @fileOverview
* <h2> * <h2>
@ -1563,6 +1563,8 @@ $.EventHandler.prototype = {
} }
/** /**
* @private
* @inner
* Only triggered in W3C browsers by elements within which the mouse was * Only triggered in W3C browsers by elements within which the mouse was
* initially pressed, since they are now listening to the window for * initially pressed, since they are now listening to the window for
* mouseup during the capture phase. We shouldn't handle the mouseup * mouseup during the capture phase. We shouldn't handle the mouseup
@ -1577,6 +1579,10 @@ $.EventHandler.prototype = {
releaseMouse(); releaseMouse();
} }
/**
* @private
* @inner
*/
function onMouseClick(event) { function onMouseClick(event) {
if (self.clickHandler) { if (self.clickHandler) {
@ -1584,6 +1590,10 @@ $.EventHandler.prototype = {
} }
} }
/**
* @private
* @inner
*/
function onMouseWheelSpin(event) { function onMouseWheelSpin(event) {
var nDelta = 0; var nDelta = 0;
if (!event) { // For IE, access the global (window) event object if (!event) { // For IE, access the global (window) event object
@ -1613,6 +1623,10 @@ $.EventHandler.prototype = {
} }
} }
/**
* @private
* @inner
*/
function handleMouseClick(event) { function handleMouseClick(event) {
var event = $.getEvent(event); var event = $.getEvent(event);
@ -1637,6 +1651,10 @@ $.EventHandler.prototype = {
} }
} }
/**
* @private
* @inner
*/
function onMouseMove(event) { function onMouseMove(event) {
var event = $.getEvent(event); var event = $.getEvent(event);
var point = getMouseAbsolute(event); var point = getMouseAbsolute(event);
@ -1663,9 +1681,11 @@ $.EventHandler.prototype = {
$.cancelEvent(event); $.cancelEvent(event);
} }
} };
/** /**
* @private
* @inner
* Only triggered once by the deepest element that initially received * Only triggered once by the deepest element that initially received
* the mouse down event. Since no other element has captured the mouse, * the mouse down event. Since no other element has captured the mouse,
* we want to trigger the elements that initially received the mouse * we want to trigger the elements that initially received the mouse
@ -1677,14 +1697,22 @@ $.EventHandler.prototype = {
} }
$.stopEvent(event); $.stopEvent(event);
} };
}; };
/**
* @private
* @inner
*/
function getMouseAbsolute( event ) { function getMouseAbsolute( event ) {
return $.getMousePosition(event); return $.getMousePosition(event);
} }
/**
* @private
* @inner
*/
function getMouseRelative( event, elmt ) { function getMouseRelative( event, elmt ) {
var mouse = $.getMousePosition(event); var mouse = $.getMousePosition(event);
var offset = $.getElementPosition(elmt); var offset = $.getElementPosition(elmt);
@ -1694,6 +1722,7 @@ $.EventHandler.prototype = {
/** /**
* @private * @private
* @inner
* Returns true if elmtB is a child node of elmtA, or if they're equal. * Returns true if elmtB is a child node of elmtA, or if they're equal.
*/ */
function isChild( elmtA, elmtB ) { function isChild( elmtA, elmtB ) {
@ -1708,10 +1737,18 @@ $.EventHandler.prototype = {
return elmtA == elmtB; return elmtA == elmtB;
} }
/**
* @private
* @inner
*/
function onGlobalMouseDown() { function onGlobalMouseDown() {
buttonDownAny = true; buttonDownAny = true;
} }
/**
* @private
* @inner
*/
function onGlobalMouseUp() { function onGlobalMouseUp() {
buttonDownAny = false; buttonDownAny = false;
} }
@ -1750,11 +1787,11 @@ $.ControlAnchor = {
* to interact with the zoomable interface. Any control can be anchored to any * to interact with the zoomable interface. Any control can be anchored to any
* element. * element.
* @class * @class
* @param {Element} elmt - the contol element to be anchored in the container. * @param {Element} element - the contol element to be anchored in the container.
* @param {OpenSeadragon.ControlAnchor} anchor - the location to anchor at. * @param {OpenSeadragon.ControlAnchor} anchor - the location to anchor at.
* @param {Element} container - the element to control will be anchored too. * @param {Element} container - the element to control will be anchored too.
* *
* @property {Element} elmt - the element providing the user interface with * @property {Element} element - the element providing the user interface with
* some type of control. Eg a zoom-in button * some type of control. Eg a zoom-in button
* @property {OpenSeadragon.ControlAnchor} anchor - the position of the control * @property {OpenSeadragon.ControlAnchor} anchor - the position of the control
* relative to the container. * relative to the container.
@ -1763,13 +1800,13 @@ $.ControlAnchor = {
* @property {Element} wrapper - a nuetral element surrounding the control * @property {Element} wrapper - a nuetral element surrounding the control
* element. * element.
*/ */
$.Control = function ( elmt, anchor, container ) { $.Control = function ( element, anchor, container ) {
this.elmt = elmt; this.element = element;
this.anchor = anchor; this.anchor = anchor;
this.container = container; this.container = container;
this.wrapper = $.makeNeutralElement( "span" ); this.wrapper = $.makeNeutralElement( "span" );
this.wrapper.style.display = "inline-block"; this.wrapper.style.display = "inline-block";
this.wrapper.appendChild( this.elmt ); this.wrapper.appendChild( this.element );
if ( this.anchor == $.ControlAnchor.NONE ) { if ( this.anchor == $.ControlAnchor.NONE ) {
// IE6 fix // IE6 fix
@ -1794,7 +1831,7 @@ $.Control.prototype = {
* @function * @function
*/ */
destroy: function() { destroy: function() {
this.wrapper.removeChild( this.elmt ); this.wrapper.removeChild( this.element );
this.container.removeChild( this.wrapper ); this.container.removeChild( this.wrapper );
}, },
@ -1824,8 +1861,8 @@ $.Control.prototype = {
* @param {Number} opactiy - a value between 1 and 0 inclusively. * @param {Number} opactiy - a value between 1 and 0 inclusively.
*/ */
setOpacity: function( opacity ) { setOpacity: function( opacity ) {
if ( this.elmt[ $.SIGNAL ] && $.Browser.vendor == $.BROWSERS.IE ) { if ( this.element[ $.SIGNAL ] && $.Browser.vendor == $.BROWSERS.IE ) {
$.setElementOpacity( this.elmt, opacity, true ); $.setElementOpacity( this.element, opacity, true );
} else { } else {
$.setElementOpacity( this.wrapper, opacity, true ); $.setElementOpacity( this.wrapper, opacity, true );
} }
@ -2047,8 +2084,6 @@ $.Viewer = function( options ) {
this._zoomFactor = null; this._zoomFactor = null;
this._lastZoomTime = null; this._lastZoomTime = null;
this.elmt = null;
var beginZoomingInHandler = $.delegate( this, beginZoomingIn ), var beginZoomingInHandler = $.delegate( this, beginZoomingIn ),
endZoomingHandler = $.delegate( this, endZooming ), endZoomingHandler = $.delegate( this, endZooming ),
doSingleZoomInHandler = $.delegate( this, doSingleZoomIn ), doSingleZoomInHandler = $.delegate( this, doSingleZoomIn ),
@ -2146,42 +2181,42 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, {
* @function * @function
* @name OpenSeadragon.Viewer.prototype.addControl * @name OpenSeadragon.Viewer.prototype.addControl
*/ */
addControl: function ( elmt, anchor ) { addControl: function ( element, anchor ) {
var elmt = $.getElement( elmt ), var element = $.getElement( element ),
div = null; div = null;
if ( getControlIndex( this, elmt ) >= 0 ) { if ( getControlIndex( this, element ) >= 0 ) {
return; // they're trying to add a duplicate control return; // they're trying to add a duplicate control
} }
switch ( anchor ) { switch ( anchor ) {
case $.ControlAnchor.TOP_RIGHT: case $.ControlAnchor.TOP_RIGHT:
div = this.controls.topright; div = this.controls.topright;
elmt.style.position = "relative"; element.style.position = "relative";
break; break;
case $.ControlAnchor.BOTTOM_RIGHT: case $.ControlAnchor.BOTTOM_RIGHT:
div = this.controls.bottomright; div = this.controls.bottomright;
elmt.style.position = "relative"; element.style.position = "relative";
break; break;
case $.ControlAnchor.BOTTOM_LEFT: case $.ControlAnchor.BOTTOM_LEFT:
div = this.controls.bottomleft; div = this.controls.bottomleft;
elmt.style.position = "relative"; element.style.position = "relative";
break; break;
case $.ControlAnchor.TOP_LEFT: case $.ControlAnchor.TOP_LEFT:
div = this.controls.topleft; div = this.controls.topleft;
elmt.style.position = "relative"; element.style.position = "relative";
break; break;
case $.ControlAnchor.NONE: case $.ControlAnchor.NONE:
default: default:
div = this.container; div = this.container;
elmt.style.position = "absolute"; element.style.position = "absolute";
break; break;
} }
this.controls.push( this.controls.push(
new $.Control( elmt, anchor, div ) new $.Control( element, anchor, div )
); );
elmt.style.display = "inline-block"; element.style.display = "inline-block";
}, },
/** /**
@ -2323,10 +2358,10 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, {
* @function * @function
* @name OpenSeadragon.Viewer.prototype.removeControl * @name OpenSeadragon.Viewer.prototype.removeControl
*/ */
removeControl: function ( elmt ) { removeControl: function ( element ) {
var elmt = $.getElement( elmt ), var element = $.getElement( element ),
i = getControlIndex( this, elmt ); i = getControlIndex( this, element );
if ( i >= 0 ) { if ( i >= 0 ) {
this.controls[ i ].destroy(); this.controls[ i ].destroy();
@ -2616,8 +2651,8 @@ function onCanvasDrag( tracker, position, delta, shift ) {
} }
}; };
function onCanvasRelease( tracker, position, insideElmtPress, insideElmtRelease ) { function onCanvasRelease( tracker, position, insideElementPress, insideElementRelease ) {
if ( insideElmtPress && this.viewport ) { if ( insideElementPress && this.viewport ) {
this.viewport.applyConstraints(); this.viewport.applyConstraints();
} }
}; };
@ -2634,8 +2669,8 @@ function onCanvasScroll( tracker, position, scroll, shift ) {
} }
}; };
function onContainerExit( tracker, position, buttonDownElmt, buttonDownAny ) { function onContainerExit( tracker, position, buttonDownElement, buttonDownAny ) {
if ( !buttonDownElmt ) { if ( !buttonDownElement ) {
this._mouseInside = false; this._mouseInside = false;
if ( !this._animating ) { if ( !this._animating ) {
beginControlsAutoHide( this ); beginControlsAutoHide( this );
@ -2643,8 +2678,8 @@ function onContainerExit( tracker, position, buttonDownElmt, buttonDownAny ) {
} }
}; };
function onContainerRelease( tracker, position, insideElmtPress, insideElmtRelease ) { function onContainerRelease( tracker, position, insideElementPress, insideElementRelease ) {
if ( !insideElmtRelease ) { if ( !insideElementRelease ) {
this._mouseInside = false; this._mouseInside = false;
if ( !this._animating ) { if ( !this._animating ) {
beginControlsAutoHide( this ); beginControlsAutoHide( this );
@ -2652,7 +2687,7 @@ function onContainerRelease( tracker, position, insideElmtPress, insideElmtRelea
} }
}; };
function onContainerEnter( tracker, position, buttonDownElmt, buttonDownAny ) { function onContainerEnter( tracker, position, buttonDownElement, buttonDownAny ) {
this._mouseInside = true; this._mouseInside = true;
abortControlsAutoHide( this ); abortControlsAutoHide( this );
}; };
@ -2660,9 +2695,9 @@ function onContainerEnter( tracker, position, buttonDownElmt, buttonDownAny ) {
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Utility methods // Utility methods
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
function getControlIndex( viewer, elmt ) { function getControlIndex( viewer, element ) {
for ( i = viewer.controls.length - 1; i >= 0; i-- ) { for ( i = viewer.controls.length - 1; i >= 0; i-- ) {
if ( viewer.controls[ i ].elmt == elmt ) { if ( viewer.controls[ i ].element == element ) {
return i; return i;
} }
} }
@ -3423,17 +3458,17 @@ $.Button = function( options ) {
//TODO - refactor mousetracer next to avoid this extension //TODO - refactor mousetracer next to avoid this extension
$.extend( this.tracker, { $.extend( this.tracker, {
enterHandler: function( tracker, position, buttonDownElmt, buttonDownAny ) { enterHandler: function( tracker, position, buttonDownElement, buttonDownAny ) {
if ( buttonDownElmt ) { if ( buttonDownElement ) {
inTo( _this, $.ButtonState.DOWN ); inTo( _this, $.ButtonState.DOWN );
_this.raiseEvent( "onEnter", _this ); _this.raiseEvent( "onEnter", _this );
} else if ( !buttonDownAny ) { } else if ( !buttonDownAny ) {
inTo( _this, $.ButtonState.HOVER ); inTo( _this, $.ButtonState.HOVER );
} }
}, },
exitHandler: function( tracker, position, buttonDownElmt, buttonDownAny ) { exitHandler: function( tracker, position, buttonDownElement, buttonDownAny ) {
outTo( _this, $.ButtonState.GROUP ); outTo( _this, $.ButtonState.GROUP );
if ( buttonDownElmt ) { if ( buttonDownElement ) {
_this.raiseEvent( "onExit", _this ); _this.raiseEvent( "onExit", _this );
} }
}, },
@ -3441,11 +3476,11 @@ $.Button = function( options ) {
inTo( _this, $.ButtonState.DOWN ); inTo( _this, $.ButtonState.DOWN );
_this.raiseEvent( "onPress", _this ); _this.raiseEvent( "onPress", _this );
}, },
releaseHandler: function( tracker, position, insideElmtPress, insideElmtRelease ) { releaseHandler: function( tracker, position, insideElementPress, insideElementRelease ) {
if ( insideElmtPress && insideElmtRelease ) { if ( insideElementPress && insideElementRelease ) {
outTo( _this, $.ButtonState.HOVER ); outTo( _this, $.ButtonState.HOVER );
_this.raiseEvent( "onRelease", _this ); _this.raiseEvent( "onRelease", _this );
} else if ( insideElmtPress ) { } else if ( insideElementPress ) {
outTo( _this, $.ButtonState.GROUP ); outTo( _this, $.ButtonState.GROUP );
} else { } else {
inTo( _this, $.ButtonState.HOVER ); inTo( _this, $.ButtonState.HOVER );
@ -3624,8 +3659,8 @@ $.ButtonGroup = function( options ) {
this.tracker.exit = options.exit || function() { this.tracker.exit = options.exit || function() {
var i, var i,
buttonDownElmt = arguments.length > 2 ? arguments[ 2 ] : null; buttonDownElement = arguments.length > 2 ? arguments[ 2 ] : null;
if ( !buttonDownElmt ) { if ( !buttonDownElement ) {
for ( i = 0; i < _this.buttons.length; i++ ) { for ( i = 0; i < _this.buttons.length; i++ ) {
_this.buttons[ i ].notifyGroupExit(); _this.buttons[ i ].notifyGroupExit();
} }
@ -3634,8 +3669,8 @@ $.ButtonGroup = function( options ) {
this.tracker.release = options.release || function() { this.tracker.release = options.release || function() {
var i, var i,
insideElmtRelease = arguments.length > 3 ? arguments[ 3 ] : null; insideElementRelease = arguments.length > 3 ? arguments[ 3 ] : null;
if ( !insideElmtRelease ) { if ( !insideElementRelease ) {
for ( i = 0; i < _this.buttons.length; i++ ) { for ( i = 0; i < _this.buttons.length; i++ ) {
_this.buttons[ i ].notifyGroupExit(); _this.buttons[ i ].notifyGroupExit();
} }
@ -4078,6 +4113,7 @@ $.Tile.prototype = {
}; };
/** /**
* An Overlay provides a
* @class * @class
*/ */
$.Overlay = function( elmt, location, placement ) { $.Overlay = function( elmt, location, placement ) {
@ -4241,20 +4277,20 @@ var QUOTA = 100,
* @property {OpenSeadragon.TileSource} source - Reference to Viewer tile source. * @property {OpenSeadragon.TileSource} source - Reference to Viewer tile source.
* @property {OpenSeadragon.Viewport} viewport - Reference to Viewer viewport. * @property {OpenSeadragon.Viewport} viewport - Reference to Viewer viewport.
* @property {Element} container - Reference to Viewer 'canvas'. * @property {Element} container - Reference to Viewer 'canvas'.
* @property {Element|Canvas} canvas * @property {Element|Canvas} canvas - TODO
* @property {CanvasContext} context * @property {CanvasContext} context - TODO
* @property {Object} config - Reference to Viewer config. * @property {Object} config - Reference to Viewer config.
* @property {Number} downloading - How many images are currently being loaded in parallel. * @property {Number} downloading - How many images are currently being loaded in parallel.
* @property {Number} normHeight - Ratio of zoomable image height to width. * @property {Number} normHeight - Ratio of zoomable image height to width.
* @property {Object} tilesMatrix A '3d' dictionary [level][x][y] --> Tile. * @property {Object} tilesMatrix - A '3d' dictionary [level][x][y] --> Tile.
* @property {Array} tilesLoaded An unordered list of Tiles with loaded images. * @property {Array} tilesLoaded - An unordered list of Tiles with loaded images.
* @property {Object} coverage '3d' dictionary [level][x][y] --> Boolean. * @property {Object} coverage - A '3d' dictionary [level][x][y] --> Boolean.
* @property {Array} overlays An unordered list of Overlays added. * @property {Array} overlays - An unordered list of Overlays added.
* @property {Array} lastDrawn An unordered list of Tiles drawn last frame. * @property {Array} lastDrawn - An unordered list of Tiles drawn last frame.
* @property {Number} lastResetTime * @property {Number} lastResetTime - Last time for which the drawer was reset.
* @property {Boolean} midUpdate Is the drawer currently updating the viewport. * @property {Boolean} midUpdate - Is the drawer currently updating the viewport?
* @property {Boolean} updateAgain Does the drawer need to update the viewort again. * @property {Boolean} updateAgain - Does the drawer need to update the viewort again?
* @property {Element} elmt DEPRECATED Alias for container. * @property {Element} elmt - DEPRECATED Alias for container.
*/ */
$.Drawer = function( source, viewport, element ) { $.Drawer = function( source, viewport, element ) {
@ -4290,6 +4326,19 @@ $.Drawer = function( source, viewport, element ) {
$.Drawer.prototype = { $.Drawer.prototype = {
/**
* Adds an html element as an overlay to the current viewport. Useful for
* highlighting words or areas of interest on an image or other zoomable
* interface.
* @method
* @param {Element|String} element - A reference to an element or an id for
* the element which will overlayed.
* @param {OpenSeadragon.Point|OpenSeadragon.Rect} location - The point or
* rectangle which will be overlayed.
* @param {OpenSeadragon.OverlayPlacement} placement - The position of the
* viewport which the location coordinates will be treated as relative
* to.
*/
addOverlay: function( element, location, placement ) { addOverlay: function( element, location, placement ) {
element = $.getElement( element ); element = $.getElement( element );
@ -4302,6 +4351,16 @@ $.Drawer.prototype = {
this.updateAgain = true; this.updateAgain = true;
}, },
/**
* Updates the overlay represented by the reference to the element or
* element id moving it to the new location, relative to the new placement.
* @method
* @param {OpenSeadragon.Point|OpenSeadragon.Rect} location - The point or
* rectangle which will be overlayed.
* @param {OpenSeadragon.OverlayPlacement} placement - The position of the
* viewport which the location coordinates will be treated as relative
* to.
*/
updateOverlay: function( element, location, placement ) { updateOverlay: function( element, location, placement ) {
var i; var i;
@ -4314,6 +4373,13 @@ $.Drawer.prototype = {
} }
}, },
/**
* Removes and overlay identified by the reference element or element id
* and schedules and update.
* @method
* @param {Element|String} element - A reference to the element or an
* element id which represent the ovelay content to be removed.
*/
removeOverlay: function( element ) { removeOverlay: function( element ) {
var i; var i;
@ -4327,6 +4393,11 @@ $.Drawer.prototype = {
} }
}, },
/**
* Removes all currently configured Overlays from this Drawer and schedules
* and update.
* @method
*/
clearOverlays: function() { clearOverlays: function() {
while ( this.overlays.length > 0 ) { while ( this.overlays.length > 0 ) {
this.overlays.pop().destroy(); this.overlays.pop().destroy();
@ -4335,20 +4406,42 @@ $.Drawer.prototype = {
}, },
/**
* Returns whether the Drawer is scheduled for an update at the
* soonest possible opportunity.
* @method
* @returns {Boolean} - Whether the Drawer is scheduled for an update at the
* soonest possible opportunity.
*/
needsUpdate: function() { needsUpdate: function() {
return this.updateAgain; return this.updateAgain;
}, },
/**
* Returns the total number of tiles that have been loaded by this Drawer.
* @method
* @returns {Number} - The total number of tiles that have been loaded by
* this Drawer.
*/
numTilesLoaded: function() { numTilesLoaded: function() {
return this.tilesLoaded.length; return this.tilesLoaded.length;
}, },
/**
* Clears all tiles and triggers an update on the next call to
* Drawer.prototype.update().
* @method
*/
reset: function() { reset: function() {
clearTiles( this ); clearTiles( this );
this.lastResetTime = +new Date(); this.lastResetTime = +new Date();
this.updateAgain = true; this.updateAgain = true;
}, },
/**
* Forces the Drawer to update.
* @method
*/
update: function() { update: function() {
//this.profiler.beginUpdate(); //this.profiler.beginUpdate();
this.midUpdate = true; this.midUpdate = true;
@ -4357,6 +4450,23 @@ $.Drawer.prototype = {
//this.profiler.endUpdate(); //this.profiler.endUpdate();
}, },
/**
* Used internally to load images when required. May also be used to
* preload a set of images so the browser will have them available in
* the local cache to optimize user experience in certain cases. Because
* the number of parallel image loads is configurable, if too many images
* are currently being loaded, the request will be ignored. Since by
* default viewer.config.imageLoaderLimit is 0, the native browser parallel
* image loading policy will be used.
* @method
* @param {String} src - The url of the image to load.
* @param {Function} callback - The function that will be called with the
* Image object as the only parameter, whether on 'load' or on 'abort'.
* For now this means the callback is expected to distinguish between
* error and success conditions by inspecting the Image object.
* @return {Boolean} loading - Wheter the request was submitted or ignored
* based on viewer.config.imageLoaderLimit.
*/
loadImage: function( src, callback ) { loadImage: function( src, callback ) {
var _this = this, var _this = this,
loading = false, loading = false,

14
src/button.js
View File

@ -141,17 +141,17 @@ $.Button = function( options ) {
//TODO - refactor mousetracer next to avoid this extension //TODO - refactor mousetracer next to avoid this extension
$.extend( this.tracker, { $.extend( this.tracker, {
enterHandler: function( tracker, position, buttonDownElmt, buttonDownAny ) { enterHandler: function( tracker, position, buttonDownElement, buttonDownAny ) {
if ( buttonDownElmt ) { if ( buttonDownElement ) {
inTo( _this, $.ButtonState.DOWN ); inTo( _this, $.ButtonState.DOWN );
_this.raiseEvent( "onEnter", _this ); _this.raiseEvent( "onEnter", _this );
} else if ( !buttonDownAny ) { } else if ( !buttonDownAny ) {
inTo( _this, $.ButtonState.HOVER ); inTo( _this, $.ButtonState.HOVER );
} }
}, },
exitHandler: function( tracker, position, buttonDownElmt, buttonDownAny ) { exitHandler: function( tracker, position, buttonDownElement, buttonDownAny ) {
outTo( _this, $.ButtonState.GROUP ); outTo( _this, $.ButtonState.GROUP );
if ( buttonDownElmt ) { if ( buttonDownElement ) {
_this.raiseEvent( "onExit", _this ); _this.raiseEvent( "onExit", _this );
} }
}, },
@ -159,11 +159,11 @@ $.Button = function( options ) {
inTo( _this, $.ButtonState.DOWN ); inTo( _this, $.ButtonState.DOWN );
_this.raiseEvent( "onPress", _this ); _this.raiseEvent( "onPress", _this );
}, },
releaseHandler: function( tracker, position, insideElmtPress, insideElmtRelease ) { releaseHandler: function( tracker, position, insideElementPress, insideElementRelease ) {
if ( insideElmtPress && insideElmtRelease ) { if ( insideElementPress && insideElementRelease ) {
outTo( _this, $.ButtonState.HOVER ); outTo( _this, $.ButtonState.HOVER );
_this.raiseEvent( "onRelease", _this ); _this.raiseEvent( "onRelease", _this );
} else if ( insideElmtPress ) { } else if ( insideElementPress ) {
outTo( _this, $.ButtonState.GROUP ); outTo( _this, $.ButtonState.GROUP );
} else { } else {
inTo( _this, $.ButtonState.HOVER ); inTo( _this, $.ButtonState.HOVER );

8
src/buttongroup.js
View File

@ -52,8 +52,8 @@ $.ButtonGroup = function( options ) {
this.tracker.exit = options.exit || function() { this.tracker.exit = options.exit || function() {
var i, var i,
buttonDownElmt = arguments.length > 2 ? arguments[ 2 ] : null; buttonDownElement = arguments.length > 2 ? arguments[ 2 ] : null;
if ( !buttonDownElmt ) { if ( !buttonDownElement ) {
for ( i = 0; i < _this.buttons.length; i++ ) { for ( i = 0; i < _this.buttons.length; i++ ) {
_this.buttons[ i ].notifyGroupExit(); _this.buttons[ i ].notifyGroupExit();
} }
@ -62,8 +62,8 @@ $.ButtonGroup = function( options ) {
this.tracker.release = options.release || function() { this.tracker.release = options.release || function() {
var i, var i,
insideElmtRelease = arguments.length > 3 ? arguments[ 3 ] : null; insideElementRelease = arguments.length > 3 ? arguments[ 3 ] : null;
if ( !insideElmtRelease ) { if ( !insideElementRelease ) {
for ( i = 0; i < _this.buttons.length; i++ ) { for ( i = 0; i < _this.buttons.length; i++ ) {
_this.buttons[ i ].notifyGroupExit(); _this.buttons[ i ].notifyGroupExit();
} }

16
src/control.js
View File

@ -20,11 +20,11 @@ $.ControlAnchor = {
* to interact with the zoomable interface. Any control can be anchored to any * to interact with the zoomable interface. Any control can be anchored to any
* element. * element.
* @class * @class
* @param {Element} elmt - the contol element to be anchored in the container. * @param {Element} element - the contol element to be anchored in the container.
* @param {OpenSeadragon.ControlAnchor} anchor - the location to anchor at. * @param {OpenSeadragon.ControlAnchor} anchor - the location to anchor at.
* @param {Element} container - the element to control will be anchored too. * @param {Element} container - the element to control will be anchored too.
* *
* @property {Element} elmt - the element providing the user interface with * @property {Element} element - the element providing the user interface with
* some type of control. Eg a zoom-in button * some type of control. Eg a zoom-in button
* @property {OpenSeadragon.ControlAnchor} anchor - the position of the control * @property {OpenSeadragon.ControlAnchor} anchor - the position of the control
* relative to the container. * relative to the container.
@ -33,13 +33,13 @@ $.ControlAnchor = {
* @property {Element} wrapper - a nuetral element surrounding the control * @property {Element} wrapper - a nuetral element surrounding the control
* element. * element.
*/ */
$.Control = function ( elmt, anchor, container ) { $.Control = function ( element, anchor, container ) {
this.elmt = elmt; this.element = element;
this.anchor = anchor; this.anchor = anchor;
this.container = container; this.container = container;
this.wrapper = $.makeNeutralElement( "span" ); this.wrapper = $.makeNeutralElement( "span" );
this.wrapper.style.display = "inline-block"; this.wrapper.style.display = "inline-block";
this.wrapper.appendChild( this.elmt ); this.wrapper.appendChild( this.element );
if ( this.anchor == $.ControlAnchor.NONE ) { if ( this.anchor == $.ControlAnchor.NONE ) {
// IE6 fix // IE6 fix
@ -64,7 +64,7 @@ $.Control.prototype = {
* @function * @function
*/ */
destroy: function() { destroy: function() {
this.wrapper.removeChild( this.elmt ); this.wrapper.removeChild( this.element );
this.container.removeChild( this.wrapper ); this.container.removeChild( this.wrapper );
}, },
@ -94,8 +94,8 @@ $.Control.prototype = {
* @param {Number} opactiy - a value between 1 and 0 inclusively. * @param {Number} opactiy - a value between 1 and 0 inclusively.
*/ */
setOpacity: function( opacity ) { setOpacity: function( opacity ) {
if ( this.elmt[ $.SIGNAL ] && $.Browser.vendor == $.BROWSERS.IE ) { if ( this.element[ $.SIGNAL ] && $.Browser.vendor == $.BROWSERS.IE ) {
$.setElementOpacity( this.elmt, opacity, true ); $.setElementOpacity( this.element, opacity, true );
} else { } else {
$.setElementOpacity( this.wrapper, opacity, true ); $.setElementOpacity( this.wrapper, opacity, true );
} }

96
src/drawer.js
View File

@ -29,20 +29,20 @@ var QUOTA = 100,
* @property {OpenSeadragon.TileSource} source - Reference to Viewer tile source. * @property {OpenSeadragon.TileSource} source - Reference to Viewer tile source.
* @property {OpenSeadragon.Viewport} viewport - Reference to Viewer viewport. * @property {OpenSeadragon.Viewport} viewport - Reference to Viewer viewport.
* @property {Element} container - Reference to Viewer 'canvas'. * @property {Element} container - Reference to Viewer 'canvas'.
* @property {Element|Canvas} canvas * @property {Element|Canvas} canvas - TODO
* @property {CanvasContext} context * @property {CanvasContext} context - TODO
* @property {Object} config - Reference to Viewer config. * @property {Object} config - Reference to Viewer config.
* @property {Number} downloading - How many images are currently being loaded in parallel. * @property {Number} downloading - How many images are currently being loaded in parallel.
* @property {Number} normHeight - Ratio of zoomable image height to width. * @property {Number} normHeight - Ratio of zoomable image height to width.
* @property {Object} tilesMatrix A '3d' dictionary [level][x][y] --> Tile. * @property {Object} tilesMatrix - A '3d' dictionary [level][x][y] --> Tile.
* @property {Array} tilesLoaded An unordered list of Tiles with loaded images. * @property {Array} tilesLoaded - An unordered list of Tiles with loaded images.
* @property {Object} coverage '3d' dictionary [level][x][y] --> Boolean. * @property {Object} coverage - A '3d' dictionary [level][x][y] --> Boolean.
* @property {Array} overlays An unordered list of Overlays added. * @property {Array} overlays - An unordered list of Overlays added.
* @property {Array} lastDrawn An unordered list of Tiles drawn last frame. * @property {Array} lastDrawn - An unordered list of Tiles drawn last frame.
* @property {Number} lastResetTime * @property {Number} lastResetTime - Last time for which the drawer was reset.
* @property {Boolean} midUpdate Is the drawer currently updating the viewport. * @property {Boolean} midUpdate - Is the drawer currently updating the viewport?
* @property {Boolean} updateAgain Does the drawer need to update the viewort again. * @property {Boolean} updateAgain - Does the drawer need to update the viewort again?
* @property {Element} elmt DEPRECATED Alias for container. * @property {Element} elmt - DEPRECATED Alias for container.
*/ */
$.Drawer = function( source, viewport, element ) { $.Drawer = function( source, viewport, element ) {
@ -78,6 +78,19 @@ $.Drawer = function( source, viewport, element ) {
$.Drawer.prototype = { $.Drawer.prototype = {
/**
* Adds an html element as an overlay to the current viewport. Useful for
* highlighting words or areas of interest on an image or other zoomable
* interface.
* @method
* @param {Element|String} element - A reference to an element or an id for
* the element which will overlayed.
* @param {OpenSeadragon.Point|OpenSeadragon.Rect} location - The point or
* rectangle which will be overlayed.
* @param {OpenSeadragon.OverlayPlacement} placement - The position of the
* viewport which the location coordinates will be treated as relative
* to.
*/
addOverlay: function( element, location, placement ) { addOverlay: function( element, location, placement ) {
element = $.getElement( element ); element = $.getElement( element );
@ -90,6 +103,16 @@ $.Drawer.prototype = {
this.updateAgain = true; this.updateAgain = true;
}, },
/**
* Updates the overlay represented by the reference to the element or
* element id moving it to the new location, relative to the new placement.
* @method
* @param {OpenSeadragon.Point|OpenSeadragon.Rect} location - The point or
* rectangle which will be overlayed.
* @param {OpenSeadragon.OverlayPlacement} placement - The position of the
* viewport which the location coordinates will be treated as relative
* to.
*/
updateOverlay: function( element, location, placement ) { updateOverlay: function( element, location, placement ) {
var i; var i;
@ -102,6 +125,13 @@ $.Drawer.prototype = {
} }
}, },
/**
* Removes and overlay identified by the reference element or element id
* and schedules and update.
* @method
* @param {Element|String} element - A reference to the element or an
* element id which represent the ovelay content to be removed.
*/
removeOverlay: function( element ) { removeOverlay: function( element ) {
var i; var i;
@ -115,6 +145,11 @@ $.Drawer.prototype = {
} }
}, },
/**
* Removes all currently configured Overlays from this Drawer and schedules
* and update.
* @method
*/
clearOverlays: function() { clearOverlays: function() {
while ( this.overlays.length > 0 ) { while ( this.overlays.length > 0 ) {
this.overlays.pop().destroy(); this.overlays.pop().destroy();
@ -123,20 +158,42 @@ $.Drawer.prototype = {
}, },
/**
* Returns whether the Drawer is scheduled for an update at the
* soonest possible opportunity.
* @method
* @returns {Boolean} - Whether the Drawer is scheduled for an update at the
* soonest possible opportunity.
*/
needsUpdate: function() { needsUpdate: function() {
return this.updateAgain; return this.updateAgain;
}, },
/**
* Returns the total number of tiles that have been loaded by this Drawer.
* @method
* @returns {Number} - The total number of tiles that have been loaded by
* this Drawer.
*/
numTilesLoaded: function() { numTilesLoaded: function() {
return this.tilesLoaded.length; return this.tilesLoaded.length;
}, },
/**
* Clears all tiles and triggers an update on the next call to
* Drawer.prototype.update().
* @method
*/
reset: function() { reset: function() {
clearTiles( this ); clearTiles( this );
this.lastResetTime = +new Date(); this.lastResetTime = +new Date();
this.updateAgain = true; this.updateAgain = true;
}, },
/**
* Forces the Drawer to update.
* @method
*/
update: function() { update: function() {
//this.profiler.beginUpdate(); //this.profiler.beginUpdate();
this.midUpdate = true; this.midUpdate = true;
@ -145,6 +202,23 @@ $.Drawer.prototype = {
//this.profiler.endUpdate(); //this.profiler.endUpdate();
}, },
/**
* Used internally to load images when required. May also be used to
* preload a set of images so the browser will have them available in
* the local cache to optimize user experience in certain cases. Because
* the number of parallel image loads is configurable, if too many images
* are currently being loaded, the request will be ignored. Since by
* default viewer.config.imageLoaderLimit is 0, the native browser parallel
* image loading policy will be used.
* @method
* @param {String} src - The url of the image to load.
* @param {Function} callback - The function that will be called with the
* Image object as the only parameter, whether on 'load' or on 'abort'.
* For now this means the callback is expected to distinguish between
* error and success conditions by inspecting the Image object.
* @return {Boolean} loading - Wheter the request was submitted or ignored
* based on viewer.config.imageLoaderLimit.
*/
loadImage: function( src, callback ) { loadImage: function( src, callback ) {
var _this = this, var _this = this,
loading = false, loading = false,

41
src/mousetracker.js
View File

@ -294,6 +294,8 @@
} }
/** /**
* @private
* @inner
* Only triggered in W3C browsers by elements within which the mouse was * Only triggered in W3C browsers by elements within which the mouse was
* initially pressed, since they are now listening to the window for * initially pressed, since they are now listening to the window for
* mouseup during the capture phase. We shouldn't handle the mouseup * mouseup during the capture phase. We shouldn't handle the mouseup
@ -308,6 +310,10 @@
releaseMouse(); releaseMouse();
} }
/**
* @private
* @inner
*/
function onMouseClick(event) { function onMouseClick(event) {
if (self.clickHandler) { if (self.clickHandler) {
@ -315,6 +321,10 @@
} }
} }
/**
* @private
* @inner
*/
function onMouseWheelSpin(event) { function onMouseWheelSpin(event) {
var nDelta = 0; var nDelta = 0;
if (!event) { // For IE, access the global (window) event object if (!event) { // For IE, access the global (window) event object
@ -344,6 +354,10 @@
} }
} }
/**
* @private
* @inner
*/
function handleMouseClick(event) { function handleMouseClick(event) {
var event = $.getEvent(event); var event = $.getEvent(event);
@ -368,6 +382,10 @@
} }
} }
/**
* @private
* @inner
*/
function onMouseMove(event) { function onMouseMove(event) {
var event = $.getEvent(event); var event = $.getEvent(event);
var point = getMouseAbsolute(event); var point = getMouseAbsolute(event);
@ -394,9 +412,11 @@
$.cancelEvent(event); $.cancelEvent(event);
} }
} };
/** /**
* @private
* @inner
* Only triggered once by the deepest element that initially received * Only triggered once by the deepest element that initially received
* the mouse down event. Since no other element has captured the mouse, * the mouse down event. Since no other element has captured the mouse,
* we want to trigger the elements that initially received the mouse * we want to trigger the elements that initially received the mouse
@ -408,14 +428,22 @@
} }
$.stopEvent(event); $.stopEvent(event);
} };
}; };
/**
* @private
* @inner
*/
function getMouseAbsolute( event ) { function getMouseAbsolute( event ) {
return $.getMousePosition(event); return $.getMousePosition(event);
} }
/**
* @private
* @inner
*/
function getMouseRelative( event, elmt ) { function getMouseRelative( event, elmt ) {
var mouse = $.getMousePosition(event); var mouse = $.getMousePosition(event);
var offset = $.getElementPosition(elmt); var offset = $.getElementPosition(elmt);
@ -425,6 +453,7 @@
/** /**
* @private * @private
* @inner
* Returns true if elmtB is a child node of elmtA, or if they're equal. * Returns true if elmtB is a child node of elmtA, or if they're equal.
*/ */
function isChild( elmtA, elmtB ) { function isChild( elmtA, elmtB ) {
@ -439,10 +468,18 @@
return elmtA == elmtB; return elmtA == elmtB;
} }
/**
* @private
* @inner
*/
function onGlobalMouseDown() { function onGlobalMouseDown() {
buttonDownAny = true; buttonDownAny = true;
} }
/**
* @private
* @inner
*/
function onGlobalMouseUp() { function onGlobalMouseUp() {
buttonDownAny = false; buttonDownAny = false;
} }

1
src/overlay.js
View File

@ -20,6 +20,7 @@
}; };
/** /**
* An Overlay provides a
* @class * @class
*/ */
$.Overlay = function( elmt, location, placement ) { $.Overlay = function( elmt, location, placement ) {

46
src/viewer.js
View File

@ -212,8 +212,6 @@ $.Viewer = function( options ) {
this._zoomFactor = null; this._zoomFactor = null;
this._lastZoomTime = null; this._lastZoomTime = null;
this.elmt = null;
var beginZoomingInHandler = $.delegate( this, beginZoomingIn ), var beginZoomingInHandler = $.delegate( this, beginZoomingIn ),
endZoomingHandler = $.delegate( this, endZooming ), endZoomingHandler = $.delegate( this, endZooming ),
doSingleZoomInHandler = $.delegate( this, doSingleZoomIn ), doSingleZoomInHandler = $.delegate( this, doSingleZoomIn ),
@ -311,42 +309,42 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, {
* @function * @function
* @name OpenSeadragon.Viewer.prototype.addControl * @name OpenSeadragon.Viewer.prototype.addControl
*/ */
addControl: function ( elmt, anchor ) { addControl: function ( element, anchor ) {
var elmt = $.getElement( elmt ), var element = $.getElement( element ),
div = null; div = null;
if ( getControlIndex( this, elmt ) >= 0 ) { if ( getControlIndex( this, element ) >= 0 ) {
return; // they're trying to add a duplicate control return; // they're trying to add a duplicate control
} }
switch ( anchor ) { switch ( anchor ) {
case $.ControlAnchor.TOP_RIGHT: case $.ControlAnchor.TOP_RIGHT:
div = this.controls.topright; div = this.controls.topright;
elmt.style.position = "relative"; element.style.position = "relative";
break; break;
case $.ControlAnchor.BOTTOM_RIGHT: case $.ControlAnchor.BOTTOM_RIGHT:
div = this.controls.bottomright; div = this.controls.bottomright;
elmt.style.position = "relative"; element.style.position = "relative";
break; break;
case $.ControlAnchor.BOTTOM_LEFT: case $.ControlAnchor.BOTTOM_LEFT:
div = this.controls.bottomleft; div = this.controls.bottomleft;
elmt.style.position = "relative"; element.style.position = "relative";
break; break;
case $.ControlAnchor.TOP_LEFT: case $.ControlAnchor.TOP_LEFT:
div = this.controls.topleft; div = this.controls.topleft;
elmt.style.position = "relative"; element.style.position = "relative";
break; break;
case $.ControlAnchor.NONE: case $.ControlAnchor.NONE:
default: default:
div = this.container; div = this.container;
elmt.style.position = "absolute"; element.style.position = "absolute";
break; break;
} }
this.controls.push( this.controls.push(
new $.Control( elmt, anchor, div ) new $.Control( element, anchor, div )
); );
elmt.style.display = "inline-block"; element.style.display = "inline-block";
}, },
/** /**
@ -488,10 +486,10 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, {
* @function * @function
* @name OpenSeadragon.Viewer.prototype.removeControl * @name OpenSeadragon.Viewer.prototype.removeControl
*/ */
removeControl: function ( elmt ) { removeControl: function ( element ) {
var elmt = $.getElement( elmt ), var element = $.getElement( element ),
i = getControlIndex( this, elmt ); i = getControlIndex( this, element );
if ( i >= 0 ) { if ( i >= 0 ) {
this.controls[ i ].destroy(); this.controls[ i ].destroy();
@ -781,8 +779,8 @@ function onCanvasDrag( tracker, position, delta, shift ) {
} }
}; };
function onCanvasRelease( tracker, position, insideElmtPress, insideElmtRelease ) { function onCanvasRelease( tracker, position, insideElementPress, insideElementRelease ) {
if ( insideElmtPress && this.viewport ) { if ( insideElementPress && this.viewport ) {
this.viewport.applyConstraints(); this.viewport.applyConstraints();
} }
}; };
@ -799,8 +797,8 @@ function onCanvasScroll( tracker, position, scroll, shift ) {
} }
}; };
function onContainerExit( tracker, position, buttonDownElmt, buttonDownAny ) { function onContainerExit( tracker, position, buttonDownElement, buttonDownAny ) {
if ( !buttonDownElmt ) { if ( !buttonDownElement ) {
this._mouseInside = false; this._mouseInside = false;
if ( !this._animating ) { if ( !this._animating ) {
beginControlsAutoHide( this ); beginControlsAutoHide( this );
@ -808,8 +806,8 @@ function onContainerExit( tracker, position, buttonDownElmt, buttonDownAny ) {
} }
}; };
function onContainerRelease( tracker, position, insideElmtPress, insideElmtRelease ) { function onContainerRelease( tracker, position, insideElementPress, insideElementRelease ) {
if ( !insideElmtRelease ) { if ( !insideElementRelease ) {
this._mouseInside = false; this._mouseInside = false;
if ( !this._animating ) { if ( !this._animating ) {
beginControlsAutoHide( this ); beginControlsAutoHide( this );
@ -817,7 +815,7 @@ function onContainerRelease( tracker, position, insideElmtPress, insideElmtRelea
} }
}; };
function onContainerEnter( tracker, position, buttonDownElmt, buttonDownAny ) { function onContainerEnter( tracker, position, buttonDownElement, buttonDownAny ) {
this._mouseInside = true; this._mouseInside = true;
abortControlsAutoHide( this ); abortControlsAutoHide( this );
}; };
@ -825,9 +823,9 @@ function onContainerEnter( tracker, position, buttonDownElmt, buttonDownAny ) {
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Utility methods // Utility methods
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
function getControlIndex( viewer, elmt ) { function getControlIndex( viewer, element ) {
for ( i = viewer.controls.length - 1; i >= 0; i-- ) { for ( i = viewer.controls.length - 1; i >= 0; i-- ) {
if ( viewer.controls[ i ].elmt == elmt ) { if ( viewer.controls[ i ].element == element ) {
return i; return i;
} }
} }