mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-26 07:06:10 +03:00
Code Issues Projects Releases Wiki Activity
2,039 Commits 12 Branches 28 Tags 35 MiB
7bf79eac77
Commit Graph

1203 Commits

Author SHA1 Message Date
Alexey Tikhonov
d43c854c9f start/stop tracking outerTracker on setMouseNavEnabled 2016-02-11 23:54:31 +03:00
Antoine Vandecreme
18b101ccf5 Fix navigator not rotated when viewport rotation set in constructor. 2016-02-09 19:20:52 -05:00
Gaetano Guerriero
d3e23a2986 fixed dzitilesource guessing of tilesUrl. 
Now the regex guessing the root url of tiles works also if the data
url (the url from which information about the tile was downloaded) does
not ends with .dzi, .xml or .js.
 2016-02-03 00:27:14 +01:00
Ian Gilman
949740d030 Merge pull request #827 from avandecreme/addsimpleimage 
Add Viewer.addSimpleImage method. Fix #818
 2016-01-28 11:35:02 -08:00
Ian Gilman
a244d7ef86 Merge pull request #825 from avandecreme/rotation 
Fix edge smoothing with rotation.
 2016-01-28 11:27:31 -08:00
Antoine Vandecreme
9dbcd28a5a English fixes. 2016-01-27 21:49:05 -05:00
Antoine Vandecreme
e10eced7d0 Use self instead of _this. 2016-01-26 19:30:09 -05:00
Antoine Vandecreme
ea6addb4c8 Add Viewer.addSimpleImage method. Fix #818 2016-01-26 18:02:11 -05:00
Antoine Vandecreme
3e56092445 Fix tests. 2016-01-26 15:59:10 -05:00
Antoine Vandecreme
43bb0d7741 Only use a larger sketch canvas if the viewport get rotated. 2016-01-26 12:04:34 -05:00
Antoine Vandecreme
a12b74ec17 Fix @lends for new JSDoc. Fix polymorphic functions doc (#824). 2016-01-24 16:09:18 -05:00
Antoine Vandecreme
33021ac24f Merge. 2016-01-23 18:49:58 -05:00
Antoine Vandecreme
c639dd5123 Fix edge smoothing with rotation. 2016-01-23 18:40:53 -05:00
Ian Gilman
0a61e160dd Merge pull request #814 from informatics-isi-edu/master 
adding setting of globalCompositeOperation for tiledImage
 2016-01-21 09:07:29 -08:00
Mei-Hui Su
69cce5770c simplify the checks on compositeOperation 2016-01-20 09:48:15 -08:00
Mei-Hui Su
91ecd80a4f Add check for null compositeOperation option when setting useSketch 2016-01-20 09:14:10 -08:00
Mei-Hui Su
ac0438e07b Fix the optional check to include null 2016-01-19 22:36:19 -08:00
Mei-Hui Su
41ee1e27fd put back the 'options.' 2016-01-19 14:29:15 -08:00
Mei-Hui Su
c214e2f0c4 change option compositeOperation default to null instead of 'source-over' 2016-01-19 14:17:52 -08:00
Scott Lewis
404e952711 escape HTML in documentation 2016-01-19 14:23:29 -07:00
Mei-Hui Su
efc9098ce4 Make setting of globalCompositeOperation optional in drawer.js 2016-01-19 11:49:04 -08:00
Ian Gilman
3e5a897eb5 Merge pull request #819 from fs-webdev/master 
Broadened the check for mime type in the url to allow query strings
 2016-01-18 09:06:44 -08:00
Mei-Hui Su
a3acaf4b8c Merge https://github.com/openseadragon/openseadragon 2016-01-15 10:58:32 -08:00
Grant Echols
746f79e3f1 Restored the mime comparison regex - I was too agressive in my changes earlier. 2016-01-15 11:42:18 -07:00
Ian Gilman
176e13cb13 Fixed erroneous asserts in spring 2016-01-15 09:19:18 -08:00
Mei-Hui Su
e89d1f4c97 fix couple of typos 2016-01-14 12:42:02 -08:00
Mei-Hui Su
3cfe8ecac2 Merge https://github.com/openseadragon/openseadragon 2016-01-14 12:32:54 -08:00
Grant Echols
7c4ef5c1e9 Broadened the check for mime type in the url to allow query strings 2016-01-14 11:00:25 -07:00
Ian Gilman
dd45e56dc4 Merge pull request #805 from accraze/tabindex-bug 
fixed tabIndex to handle empty string
 2016-01-14 09:37:35 -08:00
Ian Gilman
5390cb96c7 Removed redundant open-failed doc comment 2016-01-11 14:18:06 -08:00
Tom Crane
f7c9585003 Support tile-less IIIF as per LegacyTileSource: Fix #737 2016-01-09 14:04:21 +00: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
Ian Gilman
1e7153e88f Merge pull request #815 from openseadragon/ian 
Removed duplicate event doc
 2016-01-06 15:32:18 -08:00
Ian Gilman
62a81c9a27 Removed duplicate event doc 2016-01-06 15:28:40 -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
Hiroaki ENDOH
27c91204b6 Refactor to reflect the reviewer comments 
See also:
https://github.com/openseadragon/openseadragon/pull/807#discussion_r48447403
 2015-12-27 12:15:17 +09:00
Hiroaki ENDOH
fb222d9fe9 Fix issue that rectangle can't move to clicked destination on navigator. 
This issue can reproduce by these steps.
1. Open http://localhost:8000/test/demo/coordinates.html
2. Click Rotate button
3. Click canvas of navigator
 2015-12-26 00:41:40 +09:00
Ian Gilman
c7db21f8b4 Merge pull request #796 from avandecreme/rotation 
Fix coordinates conversion with rotation.
 2015-12-23 09:20:40 -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
Antoine Vandecreme
ebbf4ea4a0 Rename scale functions with NoRotate suffix. 2015-12-22 18:19:22 -05:00
Antoine Vandecreme
764d8f6f2c Fix crash in debug mode when tile is missing. 2015-12-16 17:40:28 -05:00
Ian Gilman
0b411969ad Merge pull request #790 from Riksarkivet/iframe 
Partial fix for drag release outside an iframe
 2015-12-15 09:59:06 -08:00
Ian Gilman
28d49df72f Fixed broken assert 2015-12-15 09:56:33 -08:00
Antoine Vandecreme
13bfb4ecfc Fix conversion methods doc. 2015-12-14 18:36:18 -05:00
Ian Gilman
4935fcd225 Removed redundant event handler in navigator 2015-12-14 11:03:25 -08:00
Antoine Vandecreme
2dcd40afc6 Fix flickering issue at certain rotation angles. 2015-12-13 11:49:58 -05:00
Antoine Vandecreme
52f8ad6aa2 Fix coordinates conversion with rotation. 2015-12-11 19:07:23 -05:00
Sebastian Öberg
8f9d2a9bfe Converted jsdoc to plain comments 2015-12-09 18:28:41 +01:00
Sebastian Öberg
2ab6f18cee Changed isInIframe to a variable for caching 2015-12-09 11:04:37 +01:00
Sebastian Öberg
703f922ed8 Fixed drag release outside of iframe when the iframe is on the same domain. 2015-12-08 11:22:29 +01:00
Antoine Vandecreme
1d04ceadff Fix home bounds with rotation. Fix #567 and #463 2015-12-05 19:18:56 -05:00
Antoine Vandecreme
5e362554e2 Normalize the rectangles 2015-12-05 17:51:21 -05:00
Antoine Vandecreme
fc919ff56d Make union reasons on bounding boxes. 2015-11-30 20:44:06 -05:00
Antoine Vandecreme
2e26ae5ff1 Remove Rect options contructor. 2015-11-30 19:11:41 -05:00
Antoine Vandecreme
94186826af Extend Rect class to support rotation. 2015-11-26 17:25:50 -05:00
Toni Munder
de29b56c59 Fixes #777: next button click pops up virtual keyboard on mobile devices 2015-11-24 18:23:54 -08:00
Petar Petrov
9922d2a4bb edge smoothing fix for Mac 2015-11-19 10:06:43 +02:00
Petar Petrov
7406727090 Merge branch 'master' of https://github.com/openseadragon/openseadragon 2015-11-16 16:44:31 +02:00
Ian Gilman
fca0a7ca1b Doc comment fix 2015-11-12 13:55:47 -08: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
954cbbdc46 Rename this.image to this._image 2015-11-09 17:57:39 -05:00
Petar Petrov
8bee1e7b8b doc tweak for edge smoothing changes - #755 2015-11-06 08:55:30 +02:00
Antoine Vandecreme
760aaa7dca Fix tests. 2015-11-05 22:32:56 -05:00
Antoine Vandecreme
f58a525f47 Discard the image as soon as possible. 2015-11-05 22:16:20 -05:00
Antoine Vandecreme
b85d0674e6 Add support to open an ImageTileSource with it constructor. 2015-11-05 22:04:21 -05:00
Petar Petrov
7eda39c9a9 fixed edge smoothing to work with clipping and placeholderFillRect - #755 2015-11-05 16:31:13 +02:00
Petar Petrov
515c15bf98 various fixes for edge smoothing - #755 2015-11-05 16:19:56 +02:00
Antoine Vandecreme
67b0d9bd99 Fix options handling and improve doc. 2015-11-04 18:47:41 -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
0c75b45075 Save the context of the full image as well. 2015-11-02 19:57:13 -05:00
Antoine Vandecreme
37ca9235f8 Avoid using data urls in ImageTileSource. 2015-11-02 19:42:14 -05: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
8e06eb56cf Add pyramid building to the ImageTileSource. 2015-11-01 15:55:39 -05: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
Ian Gilman
88709189df Merge branch 'master' into ian3 
Fixed Conflicts:
	changelog.txt
 2015-10-29 14:31:38 -07:00
Ian Gilman
6b208f8a75 * You can now change viewport margins after the viewer is created (#721) 2015-10-29 14:29:59 -07:00
Ian Gilman
671379e1c3 * Fixed an issue with TiledImage setPosition/setWidth/setHeight not reliably triggering a redraw (#720) 2015-10-29 13:42:45 -07: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
Ian Gilman
8eb4cd9453 Merge pull request #744 from javierquevedo/master 
Fixed issue in iOS devices that would cause all touch events to fail …
 2015-10-27 09:00:43 -07:00
Sebastian Gassner
85edea7250 Add overlays after loading tileSource, when using per-tileSource overlays. 2015-10-17 09:48:09 +02:00
Javier Quevedo
f20d2ffa4d Fixed issue in iOS devices that would cause all touch events to fail after a Multitasking Gesture was triggered. The fix works by aborting all touch contacts after a touch has been cancelled, since the Multitasking Gestures in iOS trigger the TouchCancel event on those touches which were active.. 2015-10-16 15:52:20 +02:00
Antoine Vandecreme
2c73b0fb44 Use Math.round instead of Math.floor and Math.ceil for overlay placement. 2015-10-09 14:15:54 -04: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
Larissa Smith
fc8b4db796 Fix for Chrome (v 45) issue that key is sometimes undefined outside of the for-in loop. 2015-09-17 15:45:39 -06:00
Ian Gilman
0003b1c193 Merge pull request #727 from TMUND/toni 
Fixed placeholderFillStyle flicker
 2015-09-16 09:34:46 -07:00
Ian Gilman
0126f588a7 Merge pull request #728 from LarissaSmith/master 
Fix for issue with tiledImages loading tiles at every level instead of just the best level:
 2015-09-16 09:27:44 -07:00
Toni Munder
a2ee81d7cb Fixed some code 2015-09-15 20:52:44 -07:00
Larissa Smith
418e21e9f4 Fix for issue with tiledImages loading tiles at every level instead of just the best level: using && instead of || means the tiledImage's longest side is used for comparison instead of the shortest side. 2015-09-15 15:58:34 -06:00
Ian Gilman
aa83e019fd Changelog for #715 and #725 2015-09-15 10:31:43 -07:00
Ian Gilman
e4b33623fa Merge pull request #725 from fs-webdev/master 
Added 'tile-load-failed' event
 2015-09-15 10:25:31 -07:00
Ian Gilman
4ac34b1190 Merge pull request #715 from LarissaSmith/master 
Added autoRefigureSizes flag for disabling calls to _figureSizes …
 2015-09-15 10:22:35 -07:00
Toni Munder
484ae63db1 Made some changes to flickering code 2015-09-14 20:45:52 -07:00
Larissa Smith
3fd51d81d7 Updated comments on setAutoRefigureSizes to eliminate reference to private variables and functions. 2015-09-14 16:14:32 -06:00
Grant Echols
4b3bfcb703 Cleaned up comments and renamed the event as per Ian's request to 'tile-load-failed' 2015-09-14 15:25:30 -06:00
Ian Gilman
b07e4b200a Merge pull request #719 from Emigre/umd 
registers an AMD module if possible
 2015-09-14 13:54:27 -07:00
Toni Munder
561d091005 Code for flickering tile 2015-09-13 19:20:34 -07:00
Larissa Smith
f4be8f859e Merge branch 'master' of https://github.com/openseadragon/openseadragon 2015-09-11 15:37:11 -06:00
Larissa Smith
60f114daf1 If autoRefigureSizes is set to true and bounds-change events have been skipped, call _figureSizes automatically. 2015-09-11 15:35:36 -06:00
Grant Echols
dd8baa1639 Added 'tile-open-failed' event to notify the app when a tile fails to load. 
This can happen when the image has authentication or other restrictions.
 2015-09-11 14:25:20 -06:00
Ian Gilman
63c066b6e5 Merge branch 'master' of github.com:openseadragon/openseadragon 2015-09-03 09:26:22 -07:00
Ian Gilman
9f2a2f361d Changelog for #711 2015-09-03 09:24:15 -07: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
Gaspar Rey
f799a1fe86 Add 'define' as a global in JSHint 2015-09-03 00:35:43 +01:00
Shaun Whitely
c825438339 Fixed navigator resize 
- Added navigatorMinZoomImageRatio with default of 1
 2015-09-02 15:58:47 +10:00
Gaspar Rey
00459189b1 Define as an AMD module if available 2015-09-02 00:10:53 +01:00
Larissa Smith
2c6dfb1b0b Changed this to _this and added documentation on setAutoRefigureSizes. 2015-09-01 10:48:41 -06:00
Shaun Whitely
6d3b582e58 Removed allowZoomToConstraintsOnResize and made the new resize behaviour 
the default
 2015-08-29 16:46:56 +10:00
Larissa Smith
913844b82b Merge branch 'master' of https://github.com/openseadragon/openseadragon 2015-08-28 16:51:36 -06:00
Larissa Smith
24be6a52ed Added autoRefigureSizes flag for disabling calls to _figureSizes during bounds-change event handlers. This improves performance when a lot of bounds-change events are fired in quick succession. Used flag to optimize world._arrange. 2015-08-28 16:10:26 -06:00
Ian Gilman
d673a453c6 Merge pull request #706 from LarissaSmith/master 
Added option in addTiledImage to replace tiledImage at index.
 2015-08-25 09:06:59 -07: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
Serge Markin
11024f44f2 FIXED: Rotation works improperly on retina display #683 2015-08-20 20:11:30 +08:00
Larissa Smith
f13691f60d Added option in addTiledImage to replace tiledImage at index. 2015-08-19 13:40:27 -06:00
Ian Gilman
bc6759e7fb Merge pull request #696 from avandecreme/master 
Avoid using eval when JSON.parse is available.
 2015-07-31 09:34:16 -07:00
Antoine Vandecreme
d960c69b34 Replace eval call when passing a Json string. 2015-07-30 16:44:41 -04:00
Antoine Vandecreme
4bb80067f7 Avoid using eval when JSON.parse is available. 2015-07-30 16:21:59 -04:00
Hasse Feldthaus
8e591d1108 Renamed ambiguous event label. 2015-07-29 18:27:23 +02:00
Hasse Feldthaus
29d5401eed Added some missing semicolons. 2015-07-29 18:19:45 +02:00
Hasse Feldthaus
565e7cd097 Added XDomainRequest as fallback method for ajax, if XMLHttpRequest fails. 2015-07-29 17:19:08 +02:00
Conner Wingard
b687332c9e Fix merge conflict in upstream changelog.txt 2015-07-14 16:46:47 -04:00
Conner Wingard
e1e345a4bc Clean up TileSource object when provided tileWidth/tileHeight for clarity. Add basic TileSource tests. 2015-07-14 14:49:52 -04:00
Conner Wingard
df7bd2e5ce Respect non-square tiles if available from IIIFTileSources 2015-07-10 14:26:51 -04:00
Ian Gilman
35c7a30dc2 Merge pull request #680 from LarissaSmith/master 
Adds collectionColumns as a configuration parameter
 2015-07-08 08:57:35 -07:00
Grant Echols
5539487814 Added error message tracking into the tile loading mechanism. This exposes the reason for the error in the console.log message 2015-07-06 15:07:00 -06:00
Grant Echols
9629f47c2c Added error message tracking into the tile loading mechanism. This exposes the reason for the error in the console.log message 2015-07-06 15:06:00 -06:00
Grant Echols
8b71876c37 Added error message tracking into the tile loading mechanism. This exposes the reason for the error in the console.log message 2015-07-06 14:57:15 -06: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
Conner Wingard
c27a43e49e Fix calling the wrong function in IIIFTileSource to retrieve tile width 2015-07-02 11:24:43 -04:00
Conner Wingard
d11c4fe107 Remove TileSource.tileSize. Convert IIIFTileSource to override TileSource.getTileWidth and TileSource.getTileHeight. 2015-06-30 17:56:06 -04:00
Ian Gilman
6db00ad286 Overlay doc fixes 2015-06-30 10:58:51 -07:00
Ian Gilman
769221f659 Merge pull request #666 from fs-webdev/master 
Added code to handle the case where autoResize=true. In this mode th…
 2015-06-29 14:14:19 -07:00
Conner Wingard
201ca8a422 Revert changes to IIIFTileSource. Changes no longer needed for non square tiles 2015-06-29 14:37:35 -04:00
Conner Wingard
827fe4e836 Deprecate TileSource.getTileSize(), add TileSource.getTileWidth() and TileSource.getTileHeight() 2015-06-29 13:42:09 -04:00
Conner Wingard
85241b1249 Fix for maintaining IIIFTileSource support while implementing #670. Change docs to reflect that TileSource.prototype.tileSize is now an OpenSeadragon.Point 2015-06-26 16:26:09 -04:00
Conner Wingard
7e950fda2b Add support for viewing custom tile sources with non-square tiles 2015-06-26 14:17:40 -04:00
Grant Echols
0806e4d4ed Fixed comment regarding autoResize. 2015-06-25 14:14:05 -06: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