Commit Graph

3357 Commits

Author SHA1 Message Date
Ian Gilman
1d327d673e
Merge pull request #2148 from Aiosa/master
Delegate tile fetching and caching to the TileSource
2022-06-28 14:12:44 -07:00
Aiosa
2fbaf71448
Merge branch 'master' into master 2022-06-28 14:14:05 +02:00
Aiosa
0aadc23fcb Merge branch 'openseadragon-master' 2022-06-28 14:11:30 +02:00
Aiosa
bb1755613e Merge branch 'master' of https://github.com/openseadragon/openseadragon into openseadragon-master
# Conflicts:
#	src/tiledimage.js
2022-06-28 14:11:02 +02:00
Ian Gilman
71e9d5775c Changelog for #2173 2022-06-20 13:59:58 -07:00
Ian Gilman
6494b49d67
Merge pull request #2173 from ahankinson/fix-iiif-id-field
Fixed: ID field parsing on IIIF tile sources
2022-06-20 13:58:14 -07:00
Andrew Hankinson
ddd375b378 Merge branch 'master' into fix-iiif-id-field 2022-06-18 15:17:20 +02:00
Andrew Hankinson
1b777c9e62 Fixed: remove redundant checks
Also fixes a JSDoc error for annotating optional parameters.
2022-06-18 15:16:48 +02:00
Andrew Hankinson
d35c0a6385 Fixed: Updated configure comment
Updated comment to make it clear that it's a static method. Also updated the example
to IIIF v2, since that's more widely used than v1.1.
2022-06-17 10:34:31 +02:00
Andrew Hankinson
86dabe624b Revert changes to ID field in configure 2022-06-17 10:23:13 +02:00
Andrew Hankinson
7a97d524f8 Improved testing data for IIIFv3
This commit adds a new set of tests for IIIFv3 Image API info
to the `formats` tests. These tests mirror the tests done for the v2
handler, but with updated 'info.json' files.

Image directories also needed to be changed to include the full width/height
parameters.

Also changed was moving the `iiif` test block up below formats, and adding a QUnit
module name. This allowed the tests to show up in the QUnit browser test.

All of the new tests were checked and pass.
2022-06-16 12:58:41 +02:00
Andrew Hankinson
820564dd3e Fixed: normalize ID property for IIIF tile source
This commit attempts to normalize all possible values of the "id" property for IIIF tile sources
into a single internal _id property.
2022-06-16 12:55:21 +02:00
Ian Gilman
9988fcebc1 Changelog for #2175 2022-06-14 14:29:14 -07:00
Ian Gilman
0114381ebe
Merge pull request #2175 from joedf/patch-2174
added navigatorElement, fix bug id-overwrite on element
2022-06-14 14:25:05 -07:00
Joe DF
650b899de3 added navigatorElement, fix bug id-overwrite on element 2022-06-14 12:56:34 -04:00
Andrew Hankinson
6eeccb530b Fixed: ID field parsing on IIIF tile sources
The IIIF specification allows for the ID field to be either with or without
an "@" prefix for IIIFv3. (See: https://iiif.io/api/image/3.0/) Currently OSD
will fail to parse an image block that uses the non-prefixed form.

This PR changes the IIIF tile source parsing to allow for both forms of the
`id` key.
2022-06-14 08:57:00 +02:00
Ian Gilman
bf395c1633 Changelog for #2166 2022-06-13 14:17:20 -07:00
Ian Gilman
d956b2ae9d
Merge pull request #2166 from joedf/patch-for-PR-1303
Patch for #1303
2022-06-13 13:49:17 -07:00
Ian Gilman
c20b2bbab9 Changelog for #2160 2022-06-09 15:44:03 -07:00
Ian Gilman
71a1f06e35
Merge pull request #2160 from joedf/patch-2
apply only zoom constraint by default for scroll events
2022-06-09 15:41:17 -07:00
Joachim de fourestier
3ca17c1508 missing period 2022-06-08 20:15:21 -04:00
Joachim de fourestier
ff4f88dc64 add some documentation 2022-06-08 20:05:43 -04:00
Ian Gilman
e8adefbe6e Minor fix to previous PR 2022-06-08 15:06:58 -07:00
Ian Gilman
4ce2bdcdd1
Merge pull request #2172 from openseadragon/copyright
Updated copyright to 2022
2022-06-08 15:03:15 -07:00
Ian Gilman
f31179c9ce Updated copyright to 2022 2022-06-08 15:02:29 -07:00
Ian Gilman
c1c380fa8f Started version 3.2.0 2022-06-07 14:06:11 -07:00
Ian Gilman
ee3fc2bd79 Version 3.1.0 2022-06-07 14:00:35 -07:00
Ian Gilman
2afc028ab2 JSDoc fixes 2022-06-07 13:56:58 -07:00
Ian Gilman
db9dcdb2cc Package-lock 2022-06-07 13:42:55 -07:00
Jirka
7b759558b1 Add tile reference to imagejob options. 2022-06-07 14:53:18 +02:00
Aiosa
1d99a2d6be
Merge branch 'openseadragon:master' into master 2022-06-07 14:48:33 +02:00
Ian Gilman
2007ba7ea5
Merge pull request #2165 from openseadragon/dependabot/npm_and_yarn/grunt-1.5.3
Bump grunt from 1.5.2 to 1.5.3
2022-05-31 13:58:07 -07:00
Joe DF
df0e598e38 fix typo 2022-05-29 21:38:38 -04:00
Joe DF
3661d6cae5 remove auto code 2022-05-29 21:31:29 -04:00
Joe DF
9772901d71 Don't overwrite the element's id if it has one already 2022-05-29 21:30:48 -04:00
Joe DF
4a877d60f7 remove unneeded code, not sure how it got there 2022-05-29 21:23:22 -04:00
Joe DF
ca368797b0 restructure again to make less confusing, less duplicate code 2022-05-29 21:18:28 -04:00
Joe DF
d4dfcd2288 fix inconsistent open-close braces, add warn when using element even when id provided 2022-05-29 20:53:11 -04:00
Joe DF
21146b6b2c Merge remote-tracking branch 'cameronbaney/add-element-option-navigator' into patch-for-PR-1303 2022-05-29 20:33:23 -04:00
dependabot[bot]
e15c65ac09
Bump grunt from 1.5.2 to 1.5.3
Bumps [grunt](https://github.com/gruntjs/grunt) from 1.5.2 to 1.5.3.
- [Release notes](https://github.com/gruntjs/grunt/releases)
- [Changelog](https://github.com/gruntjs/grunt/blob/main/CHANGELOG)
- [Commits](https://github.com/gruntjs/grunt/compare/v1.5.2...v1.5.3)

---
updated-dependencies:
- dependency-name: grunt
  dependency-type: direct:development
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-26 00:12:47 +00:00
Joe DF
5b7be6be05 implement fixes from iangilman 2022-05-19 16:52:56 -04:00
Ian Gilman
995be3c37c Changelog for #2162 2022-05-18 15:39:02 -07:00
Ian Gilman
15ef58a8f5
Merge pull request #2162 from pearcetm/imagetilesource-bugfix
Bugfix for imagetilesource _freeupCanvasMemory
2022-05-18 15:33:47 -07:00
pearcetm
af26fdbff1
Bugfix for imagetilesource _freeupCanvasMemory 2022-05-18 12:26:19 -04:00
Joe DF
325f65fe5c attempt no.2 to fix #2160 2022-05-18 11:16:28 -04:00
Joe DF
7d6437b2cd Revert "apply only zoom constraint by default for scroll events"
This reverts commit a6d1472134.
2022-05-18 10:48:58 -04:00
Ian Gilman
a27b511ad3 Changelog for #2158 2022-05-12 13:55:42 -07:00
Ian Gilman
f3f20fd30d
Merge pull request #2158 from cavenel/master
Fix wrong center point on pinch zoom
2022-05-12 13:54:26 -07:00
Joe DF
a6d1472134 apply only zoom constraint by default for scroll events 2022-05-12 15:31:51 -04:00
Christophe Avenel
f1865c3878
Fix wrong center point on touch zoom
When doing pinch to zoom, we need to do pan first and then zoom, so that the center point is correct.
Otherwise, the pan will computed on the unzoomed coordinates, giving an impression of zooming toward the center
2022-05-12 10:45:47 +02:00