mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2025-02-16 14:53:14 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into collections

Browse Source 
fixedConflicts:
	src/openseadragon.js
This commit is contained in:
Ian Gilman 2015-01-12 14:31:20 -08:00
commit a411215eba
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

@ -43,6 +43,7 @@ OPENSEADRAGON CHANGELOG
1.2.1: (in progress) 1.2.1: (in progress)
* Added preserveOverlays option (#561) * Added preserveOverlays option (#561)
* Fixed: DZI tilesource was broken (#563)
1.2.0: 1.2.0:

6
src/openseadragon.js
View File

@ -518,10 +518,12 @@
* position is preserved when navigating between images in the sequence. * position is preserved when navigating between images in the sequence.
* *
* @property {Boolean} [preserveOverlays=false] * @property {Boolean} [preserveOverlays=false]
* If the viewer has been configured with a sequence of tile sources, then * If sequenceMode is true, then normally navigating to through each image
* normally navigating to through each image resets the overlays. * resets the overlays.
* If preserveOverlays is set to true, then the overlays * If preserveOverlays is set to true, then the overlays
* are preserved when navigating between images in the sequence. * are preserved when navigating between images in the sequence.
* Note: setting preserveOverlays overrides any overlays specified in the
* "overlays" property.
* *
* @property {Boolean} [showReferenceStrip=false] * @property {Boolean} [showReferenceStrip=false]
* If sequenceMode is true, then display a scrolling strip of image thumbnails for * If sequenceMode is true, then display a scrolling strip of image thumbnails for