mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-28 16:16:08 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into ms-mousetracker

Browse Source 
# Conflicts:
#	changelog.txt
This commit is contained in:
Mark Salsbery 2020-08-25 09:13:23 -07:00
commit f7cd901672
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.txt
View File

@ -9,6 +9,7 @@ OPENSEADRAGON CHANGELOG
* Better cleanup on destruction, to avoid memory leaks (#1832 @JoFrMueller) * Better cleanup on destruction, to avoid memory leaks (#1832 @JoFrMueller)
* Miscellaneous code cleanup (#1840 @msalsbery) * Miscellaneous code cleanup (#1840 @msalsbery)
* You can now specify tileSize for the Zoomify Tile Source (#1868 @abrlam) * You can now specify tileSize for the Zoomify Tile Source (#1868 @abrlam)
* Better use of IIIF "max" and "full" URL parameters (#1871 @MImranAsghar)
* Improved browser sniffing - detect EDGE and CHROMEEDGE browsers (#1872 @msalsbery) * Improved browser sniffing - detect EDGE and CHROMEEDGE browsers (#1872 @msalsbery)
* Improved DOM event model feature detection (#1872 @msalsbery) * Improved DOM event model feature detection (#1872 @msalsbery)
* Added support for options parameter on addEvent()/removeEvent (to support passive option) (#1872 @msalsbery) * Added support for options parameter on addEvent()/removeEvent (to support passive option) (#1872 @msalsbery)

4
src/iiiftilesource.js
View File

@ -398,7 +398,7 @@ $.extend( $.IIIFTileSource.prototype, $.TileSource.prototype, /** @lends OpenSea
} }
if ( levelWidth < tileWidth && levelHeight < tileHeight ){ if ( levelWidth < tileWidth && levelHeight < tileHeight ){
if ( this.version === 2 && levelWidth === this.width ) { if ( this.version === 2 && levelWidth === this.width ) {
iiifSize = "max"; iiifSize = "full";
} else if ( this.version === 3 && levelWidth === this.width && levelHeight === this.height ) { } else if ( this.version === 3 && levelWidth === this.width && levelHeight === this.height ) {
iiifSize = "max"; iiifSize = "max";
} else if ( this.version === 3 ) { } else if ( this.version === 3 ) {
@ -420,7 +420,7 @@ $.extend( $.IIIFTileSource.prototype, $.TileSource.prototype, /** @lends OpenSea
iiifSizeW = Math.ceil( iiifTileW * scale ); iiifSizeW = Math.ceil( iiifTileW * scale );
iiifSizeH = Math.ceil( iiifTileH * scale ); iiifSizeH = Math.ceil( iiifTileH * scale );
if ( this.version === 2 && iiifSizeW === this.width ) { if ( this.version === 2 && iiifSizeW === this.width ) {
iiifSize = "max"; iiifSize = "full";
} else if ( this.version === 3 && iiifSizeW === this.width && iiifSizeH === this.height ) { } else if ( this.version === 3 && iiifSizeW === this.width && iiifSizeH === this.height ) {
iiifSize = "max"; iiifSize = "max";
} else if (this.version === 3) { } else if (this.version === 3) {