mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-22 05:06:09 +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-14 16:47:17 -07:00
commit 3630b4d365
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.txt
View File

@ -7,6 +7,7 @@ OPENSEADRAGON CHANGELOG
* Documentation fix (#1814 @kenanchristian) * Documentation fix (#1814 @kenanchristian)
* 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)
* Improved browser sniffing - detect EDGE and CHROMEEDGE browsers * Improved browser sniffing - detect EDGE and CHROMEEDGE browsers
* Improved DOM event model feature detection * Improved DOM event model feature detection
* Added support for options parameter on addEvent()/removeEvent (to support passive option) (#1669) * Added support for options parameter on addEvent()/removeEvent (to support passive option) (#1669)

6
src/zoomifytilesource.js
View File

@ -18,7 +18,7 @@
* tilesUrl: "/test/data/zoomify/" * tilesUrl: "/test/data/zoomify/"
* } * }
* *
* The tileSize is currently hardcoded to 256 (the usual Zoomify default). The tileUrl must the path to the image _directory_. * The tileSize is set to 256 (the usual Zoomify default) when it is not defined. The tileUrl must the path to the image _directory_.
* *
* 2) Loading image metadata from xml file: (CURRENTLY NOT SUPPORTED) * 2) Loading image metadata from xml file: (CURRENTLY NOT SUPPORTED)
* *
@ -44,7 +44,9 @@
* @param {String} tilesUrl * @param {String} tilesUrl
*/ */
$.ZoomifyTileSource = function(options) { $.ZoomifyTileSource = function(options) {
options.tileSize = 256; if(typeof options.tileSize === 'undefined'){
options.tileSize = 256;
}
var currentImageSize = { var currentImageSize = {
x: options.width, x: options.width,