diff --git a/build.properties b/build.properties index 54767969..4c235715 100644 --- a/build.properties +++ b/build.properties @@ -6,7 +6,7 @@ PROJECT: openseadragon BUILD_MAJOR: 0 BUILD_MINOR: 9 -BUILD_ID: 90 +BUILD_ID: 92 BUILD: ${PROJECT}.${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID} VERSION: ${BUILD_MAJOR}.${BUILD_MINOR}.${BUILD_ID} diff --git a/openseadragon.js b/openseadragon.js index 2bde467c..28bb0a99 100644 --- a/openseadragon.js +++ b/openseadragon.js @@ -1,7 +1,7 @@ /*globals OpenSeadragon */ /** - * @version OpenSeadragon 0.9.90 + * @version OpenSeadragon 0.9.92 * * @fileOverview *

@@ -487,7 +487,7 @@ window.OpenSeadragon = window.OpenSeadragon || function( options ){ zoomPerClick: 2.0, zoomPerScroll: 1.2, zoomPerSecond: 2.0, - + showNavigationControl: true, showSequenceControl: true, controlsFadeDelay: 2000, @@ -526,6 +526,7 @@ window.OpenSeadragon = window.OpenSeadragon || function( options ){ maxImageCacheCount: 200, minZoomImageRatio: 0.8, maxZoomPixelRatio: 2, + timeout: 5000, //INTERFACE RESOURCE SETTINGS prefixUrl: "/images/", @@ -3685,6 +3686,7 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype, contentSize: this.source.dimensions, springStiffness: this.springStiffness, animationTime: this.animationTime, + showNavigator: false, minZoomImageRatio: 1, maxZoomPixelRatio: 1 }); @@ -3739,13 +3741,14 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype, immediateRender: this.immediateRender, blendTime: this.blendTime, alwaysBlend: this.alwaysBlend, - minPixelRatio: this.minPixelRatio, + minPixelRatio: this.collectionMode ? 0 : this.minPixelRatio, + timeout: this.timeout, debugMode: this.debugMode, debugGridColor: this.debugGridColor }); //Instantiate a navigator if configured - if ( this.showNavigator && ! this.navigator ){ + if ( this.showNavigator && ! this.navigator && !this.collectionMode ){ this.navigator = new $.Navigator({ id: this.navigatorElement, position: this.navigatorPosition, @@ -3942,8 +3945,8 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype, bodyStyle.width = "100%"; bodyStyle.height = "100%"; - canvasStyle.backgroundColor = "black"; - canvasStyle.color = "white"; + //canvasStyle.backgroundColor = "black"; + //canvasStyle.color = "white"; //containerStyle.position = "fixed"; @@ -4745,7 +4748,7 @@ $.Navigator = function( options ){ } options = $.extend( true, { - navigatorSizeRatio: $.DEFAULT_SETTINGS.navigatorSizeRatio + sizeRatio: $.DEFAULT_SETTINGS.navigatorSizeRatio }, options, { element: this.element, //These need to be overridden to prevent recursion since @@ -4902,8 +4905,8 @@ $.Navigator = function( options ){ this.element.style.width = options.width + 'px'; this.element.style.height = options.height + 'px'; } else { - this.element.style.width = ( viewerSize.x * options.navigatorSizeRatio ) + 'px'; - this.element.style.height = ( viewerSize.y * options.navigatorSizeRatio ) + 'px'; + this.element.style.width = ( viewerSize.x * options.sizeRatio ) + 'px'; + this.element.style.height = ( viewerSize.y * options.sizeRatio ) + 'px'; } $.Viewer.apply( this, [ options ] ); @@ -5770,7 +5773,7 @@ $.extend( $.DziTileSource.prototype, $.TileSource.prototype, { } dziPath = url.split('/'); dziName = dziPath.pop(); - dziName = dziName.substring(0, dziName.indexOf('.')); + dziName = dziName.substring(0, dziName.lastIndexOf('.')); dziPath = '/' + dziPath.join('/') + '/' + dziName + '_files/'; tilesUrl = dziPath; if( host ){ @@ -7690,7 +7693,8 @@ $.Tile.prototype = { drawHTML: function( container ) { var position = this.position.apply( Math.floor ), - size = this.size.apply( Math.ceil ); + size = this.size.apply( Math.ceil ) + containerSize = $.getElementSize( container ); if ( !this.loaded || !this.image ) { $.console.warn( @@ -7701,26 +7705,48 @@ $.Tile.prototype = { } if ( !this.element ) { - this.element = $.makeNeutralElement("img"); - this.element.src = this.url; - this.style = this.element.style; + this.element = $.makeNeutralElement("img"); + this.element.src = this.url; + this.style = this.element.style; this.style.position = "absolute"; this.style.msInterpolationMode = "nearest-neighbor"; } - if ( this.element.parentNode != container ) { container.appendChild( this.element ); } - this.element.style.left = position.x + "px"; - this.element.style.top = position.y + "px"; - this.element.style.width = size.x + "px"; - this.element.style.height = size.y + "px"; + this.style.top = position.y + "px"; + this.style.left = position.x + "px"; + this.style.height = size.y + "px"; + this.style.width = size.x + "px"; + //EXPERIMENTAL - trying to figure out how to scale the container + // content during animation of the container size. + /* + if ( !this.element ) { + this.element = $.makeNeutralElement("div"); + this.image = $.makeNeutralElement("img"); + this.image.src = this.url; + this.image.style.height = '100%'; + this.image.style.width = '100%'; + this.image.style.msInterpolationMode = "nearest-neighbor"; + this.element.appendChild( this.image ); + + this.style = this.element.style; + this.style.position = "absolute"; + } + this.style.right = "0px"; + this.style.bottom = "0px"; + if ( size.y == containerSize.y || size.x == containerSize.x ){ + this.style.right = position.x + "px"; + this.style.bottom = position.y + "px"; + } + */ $.setElementOpacity( this.element, this.opacity ); + }, /** @@ -7741,7 +7767,23 @@ $.Tile.prototype = { return; } context.globalAlpha = this.opacity; + + context.save(); + + if( context.globalAlpha == 1 && this.image.src.match('.png') ){ + + context.clearRect( + position.x+1, + position.y+1, + size.x-2, + size.y-2 + ); + + } + context.drawImage( this.image, position.x, position.y, size.x, size.y ); + + context.restore(); }, /** @@ -7938,8 +7980,7 @@ $.Tile.prototype = { (function( $ ){ -var TIMEOUT = 5000, - DEVICE_SCREEN = $.getWindowSize(), +var DEVICE_SCREEN = $.getWindowSize(), BROWSER = $.Browser.vendor, BROWSER_VERSION = $.Browser.version, @@ -8008,6 +8049,7 @@ $.Drawer = function( options ) { midUpdate: false, updateAgain: true, + //internal state / configurable settings overlays: [], collectionOverlays: {}, @@ -8022,7 +8064,8 @@ $.Drawer = function( options ) { blendTime: $.DEFAULT_SETTINGS.blendTime, alwaysBlend: $.DEFAULT_SETTINGS.alwaysBlend, minPixelRatio: $.DEFAULT_SETTINGS.minPixelRatio, - debugMode: $.DEFAULT_SETTINGS.debugMode + debugMode: $.DEFAULT_SETTINGS.debugMode, + timeout: $.DEFAULT_SETTINGS.timeout }, options ); @@ -8259,7 +8302,7 @@ $.Drawer.prototype = { jobid = window.setTimeout( function(){ finishLoadingImage( image, complete, false, jobid ); - }, TIMEOUT ); + }, this.timeout ); loading = true; image.src = src; @@ -8323,8 +8366,12 @@ function updateViewport( drawer ) { //TODO drawer.canvas.innerHTML = ""; if ( USE_CANVAS ) { - drawer.canvas.width = viewportSize.x; - drawer.canvas.height = viewportSize.y; + if( drawer.canvas.width != viewportSize.x || + drawer.canvas.height != viewportSize.y + ){ + drawer.canvas.width = viewportSize.x; + drawer.canvas.height = viewportSize.y; + } drawer.context.clearRect( 0, 0, viewportSize.x, viewportSize.y ); } @@ -8568,12 +8615,17 @@ function getTile( x, y, level, tileSource, tilesMatrix, time, numTiles, normHeig function loadTile( drawer, tile, time ) { - tile.loading = drawer.loadImage( - tile.url, - function( image ){ - onTileLoad( drawer, tile, time, image ); - } - ); + if( drawer.viewport.collectionMode ){ + drawer.midUpdate = false; + onTileLoad( drawer, tile, time ); + } else { + tile.loading = drawer.loadImage( + tile.url, + function( image ){ + onTileLoad( drawer, tile, time, image ); + } + ); + } } function onTileLoad( drawer, tile, time, image ) { @@ -8593,7 +8645,7 @@ function onTileLoad( drawer, tile, time, image ) { if ( drawer.midUpdate ) { $.console.warn( "Tile load callback in middle of drawing routine." ); return; - } else if ( !image ) { + } else if ( !image && !drawer.viewport.collectionMode ) { $.console.log( "Tile %s failed to load: %s", tile, tile.url ); tile.exists = false; return; @@ -8929,9 +8981,9 @@ function drawTiles( drawer, lastDrawn ){ 'below 0px -webkit-gradient('+ 'linear,left '+ 'top,left '+ - 'bottom,from(transparent),color-stop(60%,transparent),to(rgba(255,255,255,0.4))'+ + 'bottom,from(transparent),color-stop(62%,transparent),to(rgba(255,255,255,0.62))'+ ')'; - style['border'] = '1px solid rgba(255,255,255,0.2)'; + style['border'] = '1px solid rgba(255,255,255,0.38)'; //style['borderRight'] = '1px solid #fff'; }(viewer.element.style)); @@ -9104,6 +9156,7 @@ $.Viewport.prototype = { this.fitHeightBounds = new $.Rect( 0, 0, 1, this.contentAspectY ); this.homeBounds = this.fitHeightBounds; + return this; }, /** @@ -9289,6 +9342,7 @@ $.Viewport.prototype = { bounds.y += dy; this.fitBounds( bounds, immediately ); } + return this; }, /** @@ -9297,6 +9351,7 @@ $.Viewport.prototype = { */ ensureVisible: function( immediately ) { this.applyConstraints( immediately ); + return this; }, /** @@ -9334,7 +9389,7 @@ $.Viewport.prototype = { newZoom = 1.0 / newBounds.width; if ( newZoom == oldZoom || newBounds.width == oldBounds.width ) { this.panTo( center, immediately ); - return; + return this; } referencePoint = oldBounds.getTopLeft().times( @@ -9349,6 +9404,7 @@ $.Viewport.prototype = { ); this.zoomTo( newZoom, referencePoint, immediately ); + return this; }, /** @@ -9361,6 +9417,7 @@ $.Viewport.prototype = { } else { return this.fitHorizontally( immediately ); } + return this; }, /** @@ -9385,6 +9442,7 @@ $.Viewport.prototype = { } this.fitBounds( this.homeBounds, immediately ); + return this; }, /** @@ -9409,6 +9467,7 @@ $.Viewport.prototype = { } this.fitBounds( this.homeBounds, immediately ); + return this; }, @@ -9423,6 +9482,7 @@ $.Viewport.prototype = { this.centerSpringY.target.value ); this.panTo( center.plus( delta ), immediately ); + return this; }, /** @@ -9438,6 +9498,8 @@ $.Viewport.prototype = { this.centerSpringX.springTo( center.x ); this.centerSpringY.springTo( center.y ); } + + return this; }, /** @@ -9445,6 +9507,7 @@ $.Viewport.prototype = { */ zoomBy: function( factor, refPoint, immediately ) { this.zoomTo( this.zoomSpring.target.value * factor, refPoint, immediately ); + return this; }, /** @@ -9452,15 +9515,18 @@ $.Viewport.prototype = { */ zoomTo: function( zoom, refPoint, immediately ) { + this.zoomPoint = refPoint instanceof $.Point ? + refPoint : + null; + if ( immediately ) { this.zoomSpring.resetTo( zoom ); } else { this.zoomSpring.springTo( zoom ); } - this.zoomPoint = refPoint instanceof $.Point ? - refPoint : - null; + + return this; }, /** @@ -9482,6 +9548,8 @@ $.Viewport.prototype = { } this.fitBounds( newBounds, true ); + + return this; }, /** diff --git a/src/drawer.js b/src/drawer.js index d42854f2..8f29c2fb 100644 --- a/src/drawer.js +++ b/src/drawer.js @@ -2,8 +2,7 @@ (function( $ ){ -var TIMEOUT = 5000, - DEVICE_SCREEN = $.getWindowSize(), +var DEVICE_SCREEN = $.getWindowSize(), BROWSER = $.Browser.vendor, BROWSER_VERSION = $.Browser.version, @@ -72,6 +71,7 @@ $.Drawer = function( options ) { midUpdate: false, updateAgain: true, + //internal state / configurable settings overlays: [], collectionOverlays: {}, @@ -86,7 +86,8 @@ $.Drawer = function( options ) { blendTime: $.DEFAULT_SETTINGS.blendTime, alwaysBlend: $.DEFAULT_SETTINGS.alwaysBlend, minPixelRatio: $.DEFAULT_SETTINGS.minPixelRatio, - debugMode: $.DEFAULT_SETTINGS.debugMode + debugMode: $.DEFAULT_SETTINGS.debugMode, + timeout: $.DEFAULT_SETTINGS.timeout }, options ); @@ -323,7 +324,7 @@ $.Drawer.prototype = { jobid = window.setTimeout( function(){ finishLoadingImage( image, complete, false, jobid ); - }, TIMEOUT ); + }, this.timeout ); loading = true; image.src = src; @@ -387,8 +388,12 @@ function updateViewport( drawer ) { //TODO drawer.canvas.innerHTML = ""; if ( USE_CANVAS ) { - drawer.canvas.width = viewportSize.x; - drawer.canvas.height = viewportSize.y; + if( drawer.canvas.width != viewportSize.x || + drawer.canvas.height != viewportSize.y + ){ + drawer.canvas.width = viewportSize.x; + drawer.canvas.height = viewportSize.y; + } drawer.context.clearRect( 0, 0, viewportSize.x, viewportSize.y ); } @@ -632,12 +637,17 @@ function getTile( x, y, level, tileSource, tilesMatrix, time, numTiles, normHeig function loadTile( drawer, tile, time ) { - tile.loading = drawer.loadImage( - tile.url, - function( image ){ - onTileLoad( drawer, tile, time, image ); - } - ); + if( drawer.viewport.collectionMode ){ + drawer.midUpdate = false; + onTileLoad( drawer, tile, time ); + } else { + tile.loading = drawer.loadImage( + tile.url, + function( image ){ + onTileLoad( drawer, tile, time, image ); + } + ); + } } function onTileLoad( drawer, tile, time, image ) { @@ -657,7 +667,7 @@ function onTileLoad( drawer, tile, time, image ) { if ( drawer.midUpdate ) { $.console.warn( "Tile load callback in middle of drawing routine." ); return; - } else if ( !image ) { + } else if ( !image && !drawer.viewport.collectionMode ) { $.console.log( "Tile %s failed to load: %s", tile, tile.url ); tile.exists = false; return; @@ -993,9 +1003,9 @@ function drawTiles( drawer, lastDrawn ){ 'below 0px -webkit-gradient('+ 'linear,left '+ 'top,left '+ - 'bottom,from(transparent),color-stop(60%,transparent),to(rgba(255,255,255,0.4))'+ + 'bottom,from(transparent),color-stop(62%,transparent),to(rgba(255,255,255,0.62))'+ ')'; - style['border'] = '1px solid rgba(255,255,255,0.2)'; + style['border'] = '1px solid rgba(255,255,255,0.38)'; //style['borderRight'] = '1px solid #fff'; }(viewer.element.style)); diff --git a/src/dzitilesource.js b/src/dzitilesource.js index 7843a2a4..8539284e 100644 --- a/src/dzitilesource.js +++ b/src/dzitilesource.js @@ -112,7 +112,7 @@ $.extend( $.DziTileSource.prototype, $.TileSource.prototype, { } dziPath = url.split('/'); dziName = dziPath.pop(); - dziName = dziName.substring(0, dziName.indexOf('.')); + dziName = dziName.substring(0, dziName.lastIndexOf('.')); dziPath = '/' + dziPath.join('/') + '/' + dziName + '_files/'; tilesUrl = dziPath; if( host ){ diff --git a/src/navigator.js b/src/navigator.js index ec52e548..ac2daec2 100644 --- a/src/navigator.js +++ b/src/navigator.js @@ -31,7 +31,7 @@ $.Navigator = function( options ){ } options = $.extend( true, { - navigatorSizeRatio: $.DEFAULT_SETTINGS.navigatorSizeRatio + sizeRatio: $.DEFAULT_SETTINGS.navigatorSizeRatio }, options, { element: this.element, //These need to be overridden to prevent recursion since @@ -188,8 +188,8 @@ $.Navigator = function( options ){ this.element.style.width = options.width + 'px'; this.element.style.height = options.height + 'px'; } else { - this.element.style.width = ( viewerSize.x * options.navigatorSizeRatio ) + 'px'; - this.element.style.height = ( viewerSize.y * options.navigatorSizeRatio ) + 'px'; + this.element.style.width = ( viewerSize.x * options.sizeRatio ) + 'px'; + this.element.style.height = ( viewerSize.y * options.sizeRatio ) + 'px'; } $.Viewer.apply( this, [ options ] ); diff --git a/src/openseadragon.js b/src/openseadragon.js index c2f2cbc6..93df8b76 100644 --- a/src/openseadragon.js +++ b/src/openseadragon.js @@ -487,7 +487,7 @@ window.OpenSeadragon = window.OpenSeadragon || function( options ){ zoomPerClick: 2.0, zoomPerScroll: 1.2, zoomPerSecond: 2.0, - + showNavigationControl: true, showSequenceControl: true, controlsFadeDelay: 2000, @@ -526,6 +526,7 @@ window.OpenSeadragon = window.OpenSeadragon || function( options ){ maxImageCacheCount: 200, minZoomImageRatio: 0.8, maxZoomPixelRatio: 2, + timeout: 5000, //INTERFACE RESOURCE SETTINGS prefixUrl: "/images/", diff --git a/src/tile.js b/src/tile.js index 7057987c..c514c86d 100644 --- a/src/tile.js +++ b/src/tile.js @@ -80,7 +80,8 @@ $.Tile.prototype = { drawHTML: function( container ) { var position = this.position.apply( Math.floor ), - size = this.size.apply( Math.ceil ); + size = this.size.apply( Math.ceil ) + containerSize = $.getElementSize( container ); if ( !this.loaded || !this.image ) { $.console.warn( @@ -91,26 +92,48 @@ $.Tile.prototype = { } if ( !this.element ) { - this.element = $.makeNeutralElement("img"); - this.element.src = this.url; - this.style = this.element.style; + this.element = $.makeNeutralElement("img"); + this.element.src = this.url; + this.style = this.element.style; this.style.position = "absolute"; this.style.msInterpolationMode = "nearest-neighbor"; } - if ( this.element.parentNode != container ) { container.appendChild( this.element ); } - this.element.style.left = position.x + "px"; - this.element.style.top = position.y + "px"; - this.element.style.width = size.x + "px"; - this.element.style.height = size.y + "px"; + this.style.top = position.y + "px"; + this.style.left = position.x + "px"; + this.style.height = size.y + "px"; + this.style.width = size.x + "px"; + //EXPERIMENTAL - trying to figure out how to scale the container + // content during animation of the container size. + /* + if ( !this.element ) { + this.element = $.makeNeutralElement("div"); + this.image = $.makeNeutralElement("img"); + this.image.src = this.url; + this.image.style.height = '100%'; + this.image.style.width = '100%'; + this.image.style.msInterpolationMode = "nearest-neighbor"; + this.element.appendChild( this.image ); + + this.style = this.element.style; + this.style.position = "absolute"; + } + this.style.right = "0px"; + this.style.bottom = "0px"; + if ( size.y == containerSize.y || size.x == containerSize.x ){ + this.style.right = position.x + "px"; + this.style.bottom = position.y + "px"; + } + */ $.setElementOpacity( this.element, this.opacity ); + }, /** @@ -131,7 +154,23 @@ $.Tile.prototype = { return; } context.globalAlpha = this.opacity; + + context.save(); + + if( context.globalAlpha == 1 && this.image.src.match('.png') ){ + + context.clearRect( + position.x+1, + position.y+1, + size.x-2, + size.y-2 + ); + + } + context.drawImage( this.image, position.x, position.y, size.x, size.y ); + + context.restore(); }, /** diff --git a/src/viewer.js b/src/viewer.js index 5265b94e..eaa92033 100644 --- a/src/viewer.js +++ b/src/viewer.js @@ -373,6 +373,7 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype, contentSize: this.source.dimensions, springStiffness: this.springStiffness, animationTime: this.animationTime, + showNavigator: false, minZoomImageRatio: 1, maxZoomPixelRatio: 1 }); @@ -427,13 +428,14 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype, immediateRender: this.immediateRender, blendTime: this.blendTime, alwaysBlend: this.alwaysBlend, - minPixelRatio: this.minPixelRatio, + minPixelRatio: this.collectionMode ? 0 : this.minPixelRatio, + timeout: this.timeout, debugMode: this.debugMode, debugGridColor: this.debugGridColor }); //Instantiate a navigator if configured - if ( this.showNavigator && ! this.navigator ){ + if ( this.showNavigator && ! this.navigator && !this.collectionMode ){ this.navigator = new $.Navigator({ id: this.navigatorElement, position: this.navigatorPosition, @@ -630,8 +632,8 @@ $.extend( $.Viewer.prototype, $.EventHandler.prototype, $.ControlDock.prototype, bodyStyle.width = "100%"; bodyStyle.height = "100%"; - canvasStyle.backgroundColor = "black"; - canvasStyle.color = "white"; + //canvasStyle.backgroundColor = "black"; + //canvasStyle.color = "white"; //containerStyle.position = "fixed"; diff --git a/src/viewport.js b/src/viewport.js index a62c13ed..53007264 100644 --- a/src/viewport.js +++ b/src/viewport.js @@ -79,6 +79,7 @@ $.Viewport.prototype = { this.fitHeightBounds = new $.Rect( 0, 0, 1, this.contentAspectY ); this.homeBounds = this.fitHeightBounds; + return this; }, /** @@ -264,6 +265,7 @@ $.Viewport.prototype = { bounds.y += dy; this.fitBounds( bounds, immediately ); } + return this; }, /** @@ -272,6 +274,7 @@ $.Viewport.prototype = { */ ensureVisible: function( immediately ) { this.applyConstraints( immediately ); + return this; }, /** @@ -309,7 +312,7 @@ $.Viewport.prototype = { newZoom = 1.0 / newBounds.width; if ( newZoom == oldZoom || newBounds.width == oldBounds.width ) { this.panTo( center, immediately ); - return; + return this; } referencePoint = oldBounds.getTopLeft().times( @@ -324,6 +327,7 @@ $.Viewport.prototype = { ); this.zoomTo( newZoom, referencePoint, immediately ); + return this; }, /** @@ -336,6 +340,7 @@ $.Viewport.prototype = { } else { return this.fitHorizontally( immediately ); } + return this; }, /** @@ -360,6 +365,7 @@ $.Viewport.prototype = { } this.fitBounds( this.homeBounds, immediately ); + return this; }, /** @@ -384,6 +390,7 @@ $.Viewport.prototype = { } this.fitBounds( this.homeBounds, immediately ); + return this; }, @@ -398,6 +405,7 @@ $.Viewport.prototype = { this.centerSpringY.target.value ); this.panTo( center.plus( delta ), immediately ); + return this; }, /** @@ -413,6 +421,8 @@ $.Viewport.prototype = { this.centerSpringX.springTo( center.x ); this.centerSpringY.springTo( center.y ); } + + return this; }, /** @@ -420,6 +430,7 @@ $.Viewport.prototype = { */ zoomBy: function( factor, refPoint, immediately ) { this.zoomTo( this.zoomSpring.target.value * factor, refPoint, immediately ); + return this; }, /** @@ -427,15 +438,18 @@ $.Viewport.prototype = { */ zoomTo: function( zoom, refPoint, immediately ) { + this.zoomPoint = refPoint instanceof $.Point ? + refPoint : + null; + if ( immediately ) { this.zoomSpring.resetTo( zoom ); } else { this.zoomSpring.springTo( zoom ); } - this.zoomPoint = refPoint instanceof $.Point ? - refPoint : - null; + + return this; }, /** @@ -457,6 +471,8 @@ $.Viewport.prototype = { } this.fitBounds( newBounds, true ); + + return this; }, /** diff --git a/www/developer-debug-mode.html b/www/developer-debug-mode.html index f18634dc..a3833acb 100644 --- a/www/developer-debug-mode.html +++ b/www/developer-debug-mode.html @@ -19,7 +19,7 @@ // Example OpenSeadragon({ id: "contentDiv", - prefixUrl: "/openseadragon/", + prefixUrl: "/openseadragon/images/", tileSources: "/openseadragon/examples/images/highsmith/highsmith.js", showNavigator: false, debugMode: true diff --git a/www/index.html b/www/index.html index 52a39bdc..0ec24ab5 100644 --- a/www/index.html +++ b/www/index.html @@ -18,7 +18,7 @@ // Example OpenSeadragon({ id: "contentDiv", - prefixUrl: "/openseadragon/", + prefixUrl: "/openseadragon/images/", tileSources: "/openseadragon/examples/images/highsmith/highsmith.js" }); \ No newline at end of file diff --git a/www/overlay-highlights.html b/www/overlay-highlights.html index 7c36dc46..9a0856e5 100644 --- a/www/overlay-highlights.html +++ b/www/overlay-highlights.html @@ -31,7 +31,7 @@ + + +
+
+ Another Inline Configuration for Custom Tile Sources +
+
+
+

+ Below is a make believe minimal inline configuration. Note that the + default tileSize is available as a property of the tile source. +

+ 
+    OpenSeadragon({
+        ...
+        showNavigator:      false,
+        blendTime:          0,
+        wrapHorizontal:     true,
+        tileSources:   {
+            height: 1024*256,
+            width:  1024*256,
+            tileSize: 256,
+            minLevel: 9,
+            getTileUrl: function( level, x, y ){
+
+                function zeropad( i ) {
+                    var n = String( i ),
+                        m = 6 - n.length;
+                    n = (m < 1) ? n : new Array(m + 1).join( "0" ) + n;
+                    return n.substr(0, 3) + "/" + n.substr(3);
+                };
+
+                return "http://s3.amazonaws.com/info.aaronland.tiles.shapetiles/"+(level-8)+"/"+zeropad(x)+"/"+zeropad(y)+".png";
+            }
+        }
+        ...
+    });
+
+
\ No newline at end of file diff --git a/www/tilesource-dzi.html b/www/tilesource-dzi.html index 27ae33af..18499426 100644 --- a/www/tilesource-dzi.html +++ b/www/tilesource-dzi.html @@ -32,7 +32,7 @@ diff --git a/www/tilesource-legacy.html b/www/tilesource-legacy.html index 910da498..a1cc0b7f 100644 --- a/www/tilesource-legacy.html +++ b/www/tilesource-legacy.html @@ -27,7 +27,7 @@