mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-22 21:26:10 +03:00
Code Issues Projects Releases Wiki Activity
2,987 Commits 12 Branches 28 Tags 35 MiB
165aaebd4c
Commit Graph

578 Commits

Author SHA1 Message Date
Ian Gilman
49ee98bbb0 Fixed a problem with preventDefaultAction for the canvas-drag event 2017-08-03 10:47:35 -07:00
Ian Gilman
e8971b2940 Merge branch 'master' of https://github.com/thejohnhoffer/openseadragon into thejohnhoffer-master 2017-07-13 16:53:43 -07:00
Gehan Gonsalkorale
76f5a0ed33 Fix for #1232 - constrainDuringPan causes jitter on mobile 2017-07-11 22:39:01 +01:00
Jose
aabfa32595 Merge conflict resolved 2017-07-10 23:01:04 +02:00
Ian Gilman
f0a943281b Changelog for #1213 2017-07-05 09:42:10 -07:00
Ian Gilman
818d445ec9 Merge pull request #1213 from VipSaran/master 
fix for #1210 (Dinamically show ReferenceStrip)
 2017-07-05 09:38:29 -07:00
Robert Saric
51cf6201cf fix for #1210 (Dinamically show ReferenceStrip) yet additional changes 2017-07-01 09:57:36 +02:00
Robert Saric
ec7e5e5419 fix for #1210 (Dinamically show ReferenceStrip) additional changes 2017-06-24 17:58:19 +02:00
endevea
101a734aaf process ready items always even if others fail 2017-06-22 13:43:34 +08:00
John Perdue
bfa0ac0137 Added setDebugMode function to Viewer. 
Added SetDebugMode tests.


Update in respose to PR review.
 2017-06-19 21:29:41 +01:00
Robert Saric
a783edc76f fix for #1210 (Dinamically show ReferenceStrip) 2017-06-06 18:21:14 +02:00
Robert Saric
6f3b0a6d75 fix for #1165 (Reference strip not updated for initially set page) 2017-06-03 16:10:57 +02:00
John Hoffer
1ae3a9b961 Merge branch 'master' into master 2017-05-30 12:58:05 -04:00
thejohnhoffer
7a4fda37b5 setPreload correctly treats both Primatives and Objects as Boolean Primatives 2017-05-30 12:00:43 -05:00
Ian Gilman
29f973029f Changelog for #1196 and doc tweaks 2017-05-15 10:13:34 -07:00
Ian Gilman
bf1b5fd793 Merge pull request #1196 from VipSaran/master 
fix for #1191 (extension of Viewer.open() function with initialPage argument)
 2017-05-15 10:07:58 -07:00
Robert Saric
bb68755699 fix for #1191 (extension of Viewer.open() function with initialPage argument) 2017-05-14 15:56:21 +02:00
Ian Gilman
dc70acec55 Merge pull request #1192 from UCLALibrary/timeout-configuration 
Enable configuration of ImageJob timeout
 2017-05-12 10:28:39 -07:00
Mark Allen Matney, Jr
77da306397 Enable configuration of ImageJob timeout 2017-05-11 21:36:27 -07:00
Ian Gilman
e55c5beb1c Merge pull request #1189 from lastlegion/master 
[FIX #1188] added fix for supporting weird filenames that look like JSONs
 2017-05-11 10:01:07 -07:00
Ganesh Iyer
ce1360f5cb using try/catch $.parseJSON to check for JSONs 2017-05-10 17:51:59 -04:00
Ganesh Iyer
2a251b219a added fix for supporting weird filenames that look like JSONs 2017-05-09 14:55:23 -04:00
Sean Nichols
6fdf81f266 Ignore falsy header values and improve ajaxHeaders documentation 2017-05-05 15:37:33 -04:00
Sean Nichols
15fe35a589 Improve documentation and option/argument names 2017-05-05 15:37:33 -04:00
Sean Nichols
ddab768696 Add options for loading tiles via AJAX and custom AJAX request headers. 2017-05-05 15:37:33 -04:00
superbland
bb229c24d3 Only apply constraints during an actual drag 2017-04-24 22:47:40 +01:00
jonw-cogapp
ab6cdf102e prevent unnecessary panBy on canvas-drag in viewer 2017-04-21 18:19:11 +01:00
Ian Gilman
2f7ebc2d67 Merge pull request #1149 from sickrandir/preventDefault-canvas-drag 
Manage preventDefaultAction flag inside the canvas-drag viewer event
 2017-04-21 09:51:24 -07:00
kinto
741745433d manage preventDefaultAction flag inside the canvas-drag viewer event. Trigger the canvas-drag event before default drag happens on the viewer 2017-03-15 09:51:44 +01:00
kinto
bc5e235822 Add comment instructions for using preventDefaultAction parameter in canvas-click event 2017-03-14 19:23:07 +01:00
kinto
d5031835da manage preventDefaultAction flag inside the canvas-click viewer event. Trigger the canvas-click event before default click zoom happens on the viewer 2017-03-14 16:08:52 +01:00
Jose
fba70355cd In-iframe check added before resetting all active mousetrackers 2017-02-23 19:15:29 +01:00
Jose
70bdc8839e Some issues solved 2017-02-20 20:23:25 +01:00
Jose
d5b62aabcd Patch to fix issue #697, also contains improvements when panning under certain constrains 2017-02-19 17:36:53 +01:00
Antoine Vandecreme
de25b68b43 Add eslint and hound 2017-01-16 21:41:07 +01:00
thejohnhoffer
0a44585457 documentation of opacity and preload relations 2016-11-03 22:39:00 -04:00
thejohnhoffer
bac2cab8e9 document tiledImage.preload 2016-11-02 20:45:33 -04:00
Antoine Vandecreme
33332bf774 Set rotation around center and fix typo. 2016-08-28 13:39:26 +02:00
Antoine Vandecreme
9e69462405 Merge branch 'master' of https://github.com/openseadragon/openseadragon 2016-08-21 13:16:38 +02:00
Antoine Vandecreme
a9f5e7ec73 Add unit test and fix code review comments. 2016-08-21 12:54:33 +02:00
Antoine Vandecreme
65b59c08d6 First draft of tiled image rotation. 2016-08-17 15:43:08 +02:00
Sebastian Öberg
77726a684f Use control anchor configuration for custom toolbar also 2016-08-15 13:54:10 +02:00
Rick Burgstaler
dde379ba12 Make tileSources option smarter about detecting when a json string or xml string has been passed in 
The tileSources option was only using a test looking for the presence of a "{", "[", or "<" character to determine if a json string or xml string was passed in.  It is possible for a url to contain one of these characters as well which would break using the url as a tileSources parameter.  The following is an example of a breaking url:
http://myurl.org/{25fb14f0-a839-4c4d-8c97-dd1d67b2cb35}/MyImage.xml

This patch resolves this issue.
 2016-08-10 14:30:10 -05:00
Larissa Smith
4ccabe78de Passed options.crossOriginPolicy into getTileSource. Also changed checks on crossOriginPolicy to compare to undefined, and added tests for the addTiledImage crossOriginPolicy api. 2016-07-28 09:35:43 -06:00
Larissa Smith
1e0ddcedc1 Added an option to addTiledImage to change the crossOriginPolicy. addTiledImage will also check the tileSource for crossOriginPolicy. 2016-07-21 10:26:02 -06:00
plougsgaard
b3a10aca3b Introduce variable iOSDevice that disables 8c4fcc9 when running on an iOS device. 2016-06-17 16:37:30 +02:00
A
033b650c29 Fix #946 
Fix for https://github.com/openseadragon/openseadragon/issues/946
 2016-05-26 13:24:03 -04:00
Ian Gilman
ebf7cbf918 Merge pull request #940 from avandecreme/fullpage 
Enforce html element width and height to 100% when going full page.
 2016-05-17 09:51:08 -07:00
Antoine Vandecreme
32f993f862 Enforce html element width and height to 100% when going full page. 2016-05-16 13:08:17 -04:00
Ian Gilman
ea32e1b090 Merge pull request #935 from leesei/master 
feat(navigator): add option autoFade
 2016-05-16 09:40:23 -07:00
Antoine Vandecreme
1014d5767c Fix resize handling. 2016-05-12 19:23:09 -04:00
leesei
7ea8733e5b feat(navigator): add option autoFade 2016-05-07 17:16:59 +08:00
Antoine Vandecreme
521e020b9a Viewport getBounds and fitBounds methods now take rotation into account. Fix #924 2016-05-04 22:26:33 -04:00
Antoine Vandecreme
55e0811294 Merge remote-tracking branch 'upstream/master' into doc 2016-04-10 18:37:11 -04:00
Antoine Vandecreme
4fa7ed1590 Adapt doc to new version of JSDoc. 2016-04-09 10:15:02 -04:00
Antoine Vandecreme
70b39d681b Fix viewer.addOverlay and Overlay.getBounds 2016-03-31 13:25:59 -04:00
Antoine Vandecreme
577327a629 Change overlays to now always having Point location. 2016-03-30 15:12:50 -04:00
Antoine Vandecreme
cac5f6dec3 Add overlays rotation support. 2016-03-28 17:06:59 -04:00
Antoine Vandecreme
3e3ce188b1 Add scaleWidth and scaleHeight options to overlays. 2016-03-25 16:49:58 -04:00
Ian Gilman
430804ef16 Merge pull request #888 from avandecreme/fit-in-bounds 
Add TiledImage.fitInBounds method.
 2016-03-24 09:47:15 -07:00
Antoine Vandecreme
3cacc8edcf Add fitBounds option to TiledImage constructor. 2016-03-22 16:41:28 -04:00
Antoine Vandecreme
9c461824b3 Update OpenSeadragon.Placement to be serializable. 2016-03-22 15:50:48 -04:00
Ian Gilman
55cf2bd6b9 Merge pull request #884 from avandecreme/master 
Fix flick gesture with rotation. Fix #869
 2016-03-22 09:18:18 -07:00
Antoine Vandecreme
2386900e29 Fix drag with panHorizontal/panVertical set to false. 2016-03-20 11:01:26 -04:00
Antoine Vandecreme
2740792df3 Fix flick gesture with rotation. Fix #869 2016-03-20 10:04:23 -04:00
Ian Gilman
66f99a1d39 Really no tabIndex if you pass "". 2016-03-08 09:58:50 -08:00
Grant Echols
a54d896a45 Added note about locations being viewport relative for overlays. 2016-03-04 11:26:53 -07:00
Ian Gilman
856f00994b Changelog for #853 2016-02-23 09:22:53 -08:00
Ian Gilman
cb1318de1f Merge pull request #853 from altert/smallfix 
Add Viewer.getOverlayById and Overlay.getBounds functions
 2016-02-23 09:21:16 -08:00
Alexey Tikhonov
655f5e5996 Merge branch 'master' of https://github.com/openseadragon/openseadragon into smallfix 2016-02-23 03:57:20 +03:00
Alexey Tikhonov
c44f134a6a remove 'to be removed' from getOverlayById @param comment to avoid confusion 2016-02-23 02:22:47 +03:00
Grant Echols
5f3eebe4e9 Added check to see if we were zooming before swallowing the canvas scroll event. 2016-02-22 11:59:37 -07:00
Alexey Tikhonov
97381b04a9 return null instead of false in Viewer.getOverlayById function and correct documentation 2016-02-20 00:45:33 +03:00
Antoine Vandecreme
57a52835a2 Merge branch 'master' of https://github.com/openseadragon/openseadragon into rotation 2016-02-17 18:33:43 -05:00
Alexey Tikhonov
06d263b4be Add Viewer.getOverlayById and Overlay.getBounds functions 2016-02-18 01:43:53 +03:00
Antoine Vandecreme
4634d90715 Rename this.homeBounds to this._contentBounds. 2016-02-11 20:14:49 -05:00
Alexey Tikhonov
d43c854c9f start/stop tracking outerTracker on setMouseNavEnabled 2016-02-11 23:54:31 +03:00
Antoine Vandecreme
9dbcd28a5a English fixes. 2016-01-27 21:49:05 -05:00
Antoine Vandecreme
ea6addb4c8 Add Viewer.addSimpleImage method. Fix #818 2016-01-26 18:02:11 -05:00
Mei-Hui Su
3cfe8ecac2 Merge https://github.com/openseadragon/openseadragon 2016-01-14 12:32:54 -08:00
Mei-Hui Su
087507c823 1) update according to comments from openseadragon's 2016-01-07 12:47:17 -08:00
accraze
a3f0216ad7 Added tabIndex to default to zero 
empty string is also accepted as well.
 2016-01-06 20:00:38 -08:00
Mei-Hui Su
ea833a780c Update to allow setting of globalCompositeOperation when 
html <canvas> is used to process multiple tiledImages to blend
is a specific way.
(special handling,
   when compositeOperation is 'source-over' and opacity is 1,
   useSketch is false, otherwise useSketch is true
)
Valid values are 'source-atop', 'source-in', 'source-out',
  'destination-over', 'destination-atop', 'destination-in',
  'destination-out', 'lighter', 'copy' or 'xor'
http://www.w3schools.com/tags/canvas_globalcompositeoperation.asp
 2016-01-06 07:58:36 -08:00
accraze
3925d1cb14 fixed tabIndex to handle empty string 
chrome acts buggy and jumps when tabindex is not set to empty string.

fixes #769
 2015-12-22 16:55:08 -08:00
Petar Petrov
7406727090 Merge branch 'master' of https://github.com/openseadragon/openseadragon 2015-11-16 16:44:31 +02:00
Ian Gilman
b3b1a32717 Merge pull request #760 from avandecreme/imagetilesource 
Add ImageTileSource. Fix #467
 2015-11-11 10:32:09 -08:00
Antoine Vandecreme
7c62974e57 Exit early if an array is provided as a tile source. 2015-11-09 18:19:17 -05:00
Antoine Vandecreme
760aaa7dca Fix tests. 2015-11-05 22:32:56 -05:00
Antoine Vandecreme
b85d0674e6 Add support to open an ImageTileSource with it constructor. 2015-11-05 22:04:21 -05:00
Ian Gilman
db5949c2d7 Merge pull request #754 from fs-webdev/master 
Added a patch to help slow down the scroll devices that fire too fast…
 2015-11-04 11:31:01 -08:00
Petar Petrov
8c4fcc9ca9 tile edge smoothing at high zoom - #755 2015-11-04 17:04:50 +02:00
Sebastian Öberg
6b098c1c2b Fixed zooming in with plus sign. 2015-11-04 11:00:08 +01:00
Antoine Vandecreme
14a83e1154 Add IE8 support in ImageTileSource. 2015-11-02 18:35:11 -05:00
Grant Echols
3214494dc9 Added code to swallow the canvas-scroll event if we are swallowing it because of time. 2015-11-02 16:03:27 -07:00
Antoine Vandecreme
3316a55b97 Add CORS support to ImageTileSource 2015-11-01 13:25:25 -05:00
Antoine Vandecreme
c041746366 Add ImageTileSource. Fix #467 2015-11-01 10:23:02 -05:00
Grant Echols
40edbd7a1c Updates as per code review requests 2015-10-28 17:07:51 -06:00
Grant Echols
ad4bbb9daf Changed name of config parameter to include 'MS' to suggest milliseconds. 2015-10-27 15:33:39 -06:00
Grant Echols
19c6179533 Added a patch to help slow down the scroll devices that fire too fast. This new code reduces the number of 'canvas-scroll' events that fire and slows down the zoom process. 2015-10-27 14:00:45 -06:00
Sebastian Gassner
85edea7250 Add overlays after loading tileSource, when using per-tileSource overlays. 2015-10-17 09:48:09 +02:00
Larissa Smith
4b72399e8f Use the right queue item's options when replacing an item. 2015-10-08 16:29:01 -06:00
Larissa Smith
14e86cd30b Set autoRefigureSizes back to true at the end of the loadQueue. 2015-10-07 16:09:17 -06:00
Larissa Smith
4643851da9 Optimized adding large numbers of items to the world. 2015-09-25 09:58:34 -06:00
Grant Echols
c4aa3715a7 Fixed problem with missing .length in for loop of raiseAddItemFailed event. 
Added viewer._cancelPendingImages method that clears the loadQueue.
Added call to _cancelPendingImages from within the world.removeAll method.
 2015-09-23 15:19:02 -06:00
Ian Gilman
19f35c293b Merge pull request #711 from AlbinoShaun/master 
Change resize behaviour to prevent "snapping" to world bounds
 2015-09-03 09:21:29 -07:00
Shaun Whitely
59a6a43379 Revert "Fixed navigator resize" 
- This reverts commit c825438339.
- Made navigator always use a minZoomImageRatio of 1
 2015-09-03 09:44:27 +10:00
Shaun Whitely
c825438339 Fixed navigator resize 
- Added navigatorMinZoomImageRatio with default of 1
 2015-09-02 15:58:47 +10:00
Shaun Whitely
6d3b582e58 Removed allowZoomToConstraintsOnResize and made the new resize behaviour 
the default
 2015-08-29 16:46:56 +10:00
Shaun Whitely
bd4921c285 Added option to avoid image from snapping to home bounds on resize. 2015-08-25 22:06:53 +10:00
Larissa Smith
7076d64b1b Fixed race condition for replacing a tiledImage where the world may have changed before the new tiledImage loads. Added test for replacing with addTiledImage. 2015-08-21 11:01:32 -06:00
Larissa Smith
f13691f60d Added option in addTiledImage to replace tiledImage at index. 2015-08-19 13:40:27 -06:00
Antoine Vandecreme
d960c69b34 Replace eval call when passing a Json string. 2015-07-30 16:44:41 -04:00
Larissa Smith
339401683f Added configuration parameter to allow a horizontal layout that has a fixed number of columns or a vertical layout that has a fixed number of rows. 2015-07-02 13:20:57 -06:00
Ian Gilman
6db00ad286 Overlay doc fixes 2015-06-30 10:58:51 -07:00
Grant Echols
df878f6f82 Changed preserveImageSizeOnResize to require autoResize=true. 
Refactored resizing code to share more code.
Removed preserveImageSizeOnResize parameter from viewer.
 2015-06-24 10:48:00 -06:00
Grant Echols
fb21dabd76 Added configuration parameter: preserveImageSizeOnResize to preserve the default behavior. 
Changed fitBounds to fitBoundsWithConstraints as per Ian's instructions.
 2015-06-23 10:55:57 -06:00
Grant Echols
57c06a9a19 Fixed problem with build complaining about variable name reuse. 2015-06-22 13:35:45 -06:00
Grant Echols
1c14f5cc94 Added code to handle the case where autoResize=false. In this mode the image size is preserved and the center is maintained. 
This may be considered changing the default behavior so I'd welcome a suggestion to add a configuration parameter to help preserve the default behavior.
 2015-06-22 13:29:51 -06:00
Antoine Vandecreme
dd782a427e Add documentation on pre-full-screen event. Fix #487 2015-05-16 10:36:00 -04:00
Ian Gilman
efa8ccff35 * Keyboard pan speed is now the same regardless of zoom level (#645) 2015-05-05 17:20:20 -07:00
Antoine Vandecreme
9d053c545b Fix Ian's comments. 2015-04-20 19:25:36 -04:00
Antoine Vandecreme
44395662d1 Add opacity support. 2015-04-19 16:10:37 -04:00
Philip Giuliani
425acc38f9 Fix overwriting the tiledImage options 2015-04-13 18:59:13 +02:00
Philip Giuliani
f8503bd6ac Add placeholderFillStyle option to tiledImage 2015-04-10 14:31:08 +02:00
Philip Giuliani
4523454ff1 Add option to define the fillStyle of the placeholder 2015-04-09 13:44:55 +02:00
Ian Gilman
c27f68640f Docs for clip feature, as well as get and set 2015-03-19 16:38:52 -07:00
Ian Gilman
e1d36ffb14 First version of clip feature 2015-03-18 10:03:44 -07:00
Philip Giuliani
8dc8779fee Clear the imageLoader when re-drawing 2015-03-03 09:29:44 +01:00
Antoine Vandecreme
a372274ee1 Fix Cross Origin policy not working (#612) 
Remove useless hostUrl field
 2015-02-26 17:57:31 -05:00
edsilv
89d488bb7e removed show/hide controls 2015-02-24 14:55:46 +00:00
edsilv
de4ad6dde6 Merge branch 'master' into ed 2015-02-24 14:47:32 +00:00
edsilv
cf063a71f5 Merge remote-tracking branch 'upstream/master' 2015-02-24 12:05:07 +00:00
edsilv
a5394c62f7 show/hide controls 2015-02-21 11:44:04 +00:00
edsilv
22bfbac916 Merge remote-tracking branch 'upstream/master' 2015-02-21 11:36:43 +00:00
Martin Pluta
cfd2693fc7 added destroy and clear methods to resolve tile caching issue 2015-02-20 21:12:34 +01:00
Ian Gilman
f118ae9407 Minor preserveOverlays cleanup 2015-02-13 13:26:44 -08:00
Ian Gilman
88c488d706 For multi-image open, drawing isn't started until all tileSources have been opened 2015-02-10 11:30:36 -08:00
edsilv
4d8ab41808 remove show/hide controls 2015-02-09 21:29:17 +00:00
edsilv
c5a8074b1e ignore .idea files, added show/hide controls methods 2015-02-06 13:58:13 +00:00
Ian Gilman
ae3b100483 Merge branch 'collections' into m2 2015-01-22 11:16:09 -08:00
Ian Gilman
735fcc3e37 Merge branch 'master' into collections 
fixed Conflicts:
	src/navigator.js
	src/openseadragon.js
 2015-01-22 11:15:45 -08:00
Mark Salsbery
c2ebbbe1af Merge branch 'master' into viewer_focus 
Conflicts:
	changelog.txt
 2015-01-21 14:59:41 -08:00
Mark Salsbery
43d8924513 Added tabIndex option to viewer 2015-01-21 12:47:42 -08:00
Mark Salsbery
1e8b3a1ea6 Removed Viewer focusHandler/onCanvasFocus 
Presumably, this was meant to manually scroll the viewer into view when it receives focus. This is already handled by browsers when tabbing to the viewer, so doing it explicitly isn't necessary, and it creates a negative user experience when clicking on a viewer to give it focus (as of #569).
 2015-01-21 11:49:19 -08:00
Mark Salsbery
545997bace MouseTracker now defaults to tracking on (#558) 2015-01-20 18:35:58 -08:00
Ian Gilman
897a237807 Added viewport-change event; fixed spring reset 2015-01-20 11:23:34 -08:00
Ian Gilman
732cd87a10 Merge branch 'collections' into m2 
fixed Conflicts:
	changelog.txt
 2015-01-19 10:45:26 -08:00
Ian Gilman
dc1a7c9cc5 Merge branch 'master' into collections 
fixed Conflicts:
	src/viewer.js
 2015-01-19 10:35:31 -08:00
Mark Salsbery
0f5c205656 Cut/pasted code fix 2015-01-17 11:25:24 -08:00
Mark Salsbery
412ebce94d Keyboard navigation fixes 
Removed textarea element from Viewer DOM. Viewer.canvas now handles keyboard navigation.
 2015-01-17 11:18:55 -08:00