Commit Graph

1745 Commits

Author SHA1 Message Date
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
Antoine Vandecreme
0f82eed0db Add times parameter to addOnceHandler. 2016-03-22 13:54:35 -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
fddf0fb938 Use variable instead of function name. 2016-03-22 10:03:52 -04:00
Antoine Vandecreme
e4fca14c33 Add TiledImage.fitInBounds method. 2016-03-21 16:11:50 -04:00
Antoine Vandecreme
d3b027bade Add addOnceHandler method to EventSource. 2016-03-21 11:27:43 -04:00
Antoine Vandecreme
2386900e29 Fix drag with panHorizontal/panVertical set to false. 2016-03-20 11:01:26 -04:00
Antoine Vandecreme
43a9c14d3b Merge branch 'master' of https://github.com/avandecreme/openseadragon 2016-03-20 10:04:44 -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
Ian Gilman
7c5e7bf093 Merge pull request #872 from rvdb/fix-page-jump
removed automatic focus from reference strip, which caused HTML pages…
2016-03-07 09:44:23 -08:00
rvdb
ef1e5c7d06 removed automatic focus from reference strip, which caused HTML pages to jump unwantedly to the reference strip upon loading 2016-03-04 22:43:20 +01:00
Grant Echols
a54d896a45 Added note about locations being viewport relative for overlays. 2016-03-04 11:26:53 -07:00
Ralph Krimmel
e993297f60 Removing unneccessary blank lines 2016-02-26 17:18:52 +01:00
Ian Gilman
4e1a56472c Merge pull request #861 from avandecreme/transparency
Fix transparent images clearing the images in background. Fix #849
2016-02-25 09:29:50 -08:00
Ralph Krimmel
c9144c0add Adding missing newline at the end of the file 2016-02-25 11:53:55 +01:00
Ralph Krimmel
8637388cab Respecting hints from jslint 2016-02-25 11:48:01 +01:00
Ralph Krimmel
e54f1a24f0 Fixing intendation 2016-02-25 10:18:48 +01:00
Ralph Krimmel
7d4eff0bb8 Minor style fixes 2016-02-25 10:16:08 +01:00
Antoine Vandecreme
963986d187 Add missing parenthesis. 2016-02-24 19:53:35 -05:00
Antoine Vandecreme
d18485844d Fix crash and improve tests.. 2016-02-24 19:48:11 -05:00
Ralph Krimmel
48eee7e75c Added first version of zoomifytilesource.js 2016-02-24 09:16:28 +01:00
Antoine Vandecreme
7e3320c167 Fix transparent images clearing the images in backgroumd. Fix #849 2016-02-23 19:37:41 -05:00
Antoine Vandecreme
b17b9c6f03 Fix edge smoothing with png tiles. Fix #854 2016-02-23 13:49:11 -05:00
Alexey Tikhonov
0737ba1a83 update to new coding style 2016-02-23 20:47:16 +03:00
Alexey Tikhonov
f51658f0af don't draw tiles with opacity 0, see #806 2016-02-23 20:42:21 +03: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
Alexey Tikhonov
7bcb1cc59f return clone of bounds in Overlay.getBounds so original bounds wouldn't be affected 2016-02-20 00:44: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
Antoine Vandecreme
015b1ca266 Rename worldContentSize to contentSizeNoRotate. 2016-02-17 18:08:26 -05:00
Alexey Tikhonov
06d263b4be Add Viewer.getOverlayById and Overlay.getBounds functions 2016-02-18 01:43:53 +03:00
Antoine Vandecreme
0725645344 Fix applyConstraints. Fix #833. 2016-02-15 17:09:31 -05:00
Antoine Vandecreme
eaab4fb4c5 Replace call to viewport.setHomeBounds by viewport._setContentBounds 2016-02-13 11:39:40 -05:00
Antoine Vandecreme
925ba8a78e Rename viewport.contentAspectX to viewport.contentAspectRatio. Remove viewport.contentAspectY. 2016-02-13 11:20:34 -05: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
18b101ccf5 Fix navigator not rotated when viewport rotation set in constructor. 2016-02-09 19:20:52 -05:00
Ian Gilman
f1cdf90653 Added "fully-loaded" event to TiledImage 2016-02-05 09:14:43 -08: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
Rick Smith
d2f1e432cd Use spaces not tabs
Phew...flame war averted.   ;)
2015-06-23 16:08:18 -06:00
Rick Smith
b1c6a75c49 When overlays are hidden, keep them that way
Overlays previously had their display set to 'block' each time they were drawn.  Now if their display is 'none' their display property is left alone
2015-06-23 16:04:40 -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
Ian Gilman
6ffc81760c Merge pull request #662 from avandecreme/coordinates
Add coordinates conversion methods to TiledImage.
2015-06-19 13:13:12 -07:00
Antoine Vandecreme
5e653b4796 Fix assert in cacheTile. 2015-06-15 16:43:34 -04:00
Antoine Vandecreme
d671049a17 Fix and add unit tests. 2015-06-11 15:27:36 -04:00
Antoine Vandecreme
8a6177b729 Add tile-unloaded event. 2015-06-11 13:18:17 -04:00
Antoine Vandecreme
584daea732 Doc and test messages fix. 2015-06-11 10:59:32 -04:00
Antoine Vandecreme
606d25dbe6 Merge upstream. 2015-06-08 10:38:16 -04:00
Antoine Vandecreme
d5c431b1cd Integrate Ian's comments. 2015-06-03 14:40:20 -04:00
Antoine Vandecreme
2674104007 Fix flickering tiles with useCanvas=false when no cache is used. Fix #661 2015-06-03 14:34:18 -04:00
Antoine Vandecreme
aa021d87c0 Add coordinates conversion methods to TiledImage. 2015-06-02 16:41:37 -04:00
Antoine Vandecreme
be657c0b3d Add getCompletionCallback method. 2015-06-02 12:59:38 -04:00
Antoine Vandecreme
4c1d0f9a4c Fix Ian's comments. 2015-06-02 11:35:59 -04:00
Antoine Vandecreme
eda47e6fc0 Add tile-loaded event. 2015-05-29 15:10:47 -04:00
Antoine Vandecreme
2538f2023c Move tile caching code inside tilecache.js. 2015-05-29 11:49:58 -04: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
dd07771415 Fix drawer.clear 2015-04-22 18:30:49 -04: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
0d056145a3 💄 Rename to drawRectangle 2015-04-15 18:31:56 +02:00
Philip Giuliani
9df77ee915 Return early in drawDebugInfo 2015-04-15 13:40:12 +02:00
Philip Giuliani
21d32b59f5 Pass tiledImage and context to the placeholderFillStyle function 2015-04-15 13:32:41 +02:00
Philip Giuliani
6b1580824a Remove contextSaved 2015-04-14 19:43:41 +02:00
Philip Giuliani
6677953d87 Save and restore inside of the drawer 2015-04-13 19:05:23 +02:00
Philip Giuliani
3ce7024e97 Revert to usedClip 2015-04-13 19:02:04 +02:00
Philip Giuliani
425acc38f9 Fix overwriting the tiledImage options 2015-04-13 18:59:13 +02:00
Philip Giuliani
e3ae7b56f1 :docs: Document placeholderFillStyle 2015-04-11 19:01:09 +02:00
Philip Giuliani
ff6e604b94 Add comment 2015-04-10 16:20:54 +02:00
Philip Giuliani
f8503bd6ac Add placeholderFillStyle option to tiledImage 2015-04-10 14:31:08 +02:00
Philip Giuliani
5958c50d62 Update tiledImage to use the new function of the drawer 2015-04-09 19:57:55 +02:00
Philip Giuliani
1a230d8b9f Add viewportToDrawerRectangle to Drawer 2015-04-09 19:57:28 +02:00
Philip Giuliani
da819ac15a Add possibility to draw gradients and images 2015-04-09 14:25:07 +02:00
Philip Giuliani
4523454ff1 Add option to define the fillStyle of the placeholder 2015-04-09 13:44:55 +02:00
Philip Giuliani
50e46b104e Extract rect calculation 2015-04-08 21:45:38 +02:00
Philip Giuliani
6778533642 Call drawPlaceholder when no tiles are drawn 2015-04-08 20:14:13 +02:00
Philip Giuliani
fc56c4e2ef Add method to draw a placeholder 2015-04-08 20:13:56 +02:00
Ian Gilman
332b28ab2d * Now animating zoom spring exponentially 2015-03-30 14:50:37 -07:00
Ian Gilman
ac7689d45b Merge branch 'master' into spring 2015-03-27 16:04:27 -07:00
Ian Gilman
e433863f09 Test for clip feature 2015-03-20 10:09:33 -07: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
Ian Gilman
b395f1793d Logarithmic option for springs; used for zoomSpring 2015-03-17 16:43:25 -07:00
Ian Gilman
19ade7d76d Improved zoom and pan constraints 2015-03-11 15:41:36 -07:00
Philip Giuliani
75b0d316f8 Forgot var 2015-03-03 09:36:04 +01:00
Philip Giuliani
8dc8779fee Clear the imageLoader when re-drawing 2015-03-03 09:29:44 +01:00
Philip Giuliani
6bf3b8d7d4 Set loading to false when job is aborted 2015-03-03 09:29:31 +01:00
Philip Giuliani
55ea2c3b51 Call abort on all jobs before the queue gets cleared 2015-03-03 09:29:23 +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
cc18a85591 when reloading, viewerSize is being set to 0, 0. check that x and y have a non-zero value, otherwise results in IE8 error when rounding NaN 2015-02-21 12:00:21 +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
Antoine Vandecreme
6662001aae Fixed Firefox 35 not able to open local files (#588) 2015-02-10 18:28:05 -05: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
1f494b16d1 Merge branch 'ed' 2015-02-09 21:19:07 +00:00
Jonas Daniel
f5f6ee5831 Fixed x/y typo in reference strip.
Typo caused horizontal strip to be rendered only relative to height, not to width as it should. On typical landscape sized screens this forced only ~half the reference strip to be (pre-)rendered at any time.
2015-02-09 21:19:30 +01:00
edsilv
c5a8074b1e ignore .idea files, added show/hide controls methods 2015-02-06 13:58:13 +00:00
Ian Gilman
4bf40bffc1 Merge branch 'master' into collections 2015-02-05 14:46:43 -08:00
Ian Gilman
1e8731a2ba Merge branch 'collections' into m2
Fixed Conflicts:
	changelog.txt
2015-02-04 09:35:20 -08:00
Ian Gilman
bd1dad7829 Merge pull request #583 from wesleyfok/collections
WIP basic high pixel density support re: openseadragon/openseadragon#541
2015-02-04 09:10:50 -08:00
Wesley Fok
65c8ed6f36 drawDebugInfo is now high-dpi aware 2015-02-03 14:45:39 -05:00
Jon Stroop
32338efe32 wasn't using canonical syntax 2015-02-03 10:14:46 -05:00
Wesley Fok
b67cf2aa08 Fixed tile image canvas being too large 2015-01-30 16:40:34 -05:00
Wesley Fok
832ba62df0 Remove unneeded $.console.log calls 2015-01-30 16:03:45 -05:00
Wesley Fok
28ddf5a809 Backed out old coordinate translation modifications, moving pixel density check to rendering code 2015-01-30 15:46:52 -05:00
Wesley Fok
a23da44b8f Clean up $.pixelDensityRatio comments 2015-01-29 15:14:41 -05:00
unknown
3402d33088 WIP basic high pixel density support re: openseadragon/openseadragon#541 2015-01-29 11:19:49 -05: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
1da57564df Merge branch 'master' into mousetracker_defaulton
Conflicts:
	changelog.txt
	src/navigator.js
2015-01-21 11:18:52 -08:00
Mark Salsbery
406005c8c9 Removed dead code 2015-01-21 09:42:03 -08:00
Mark Salsbery
2fd2da465b Merge branch 'master' into navigator_disable
Conflicts:
	changelog.txt
2015-01-21 09:38:40 -08:00
Mark Salsbery
545997bace MouseTracker now defaults to tracking on (#558) 2015-01-20 18:35:58 -08:00
Ian Gilman
2172da6aaa * Fixed an error in fitBounds that occurred sometimes with immediately = true 2015-01-20 17:19:13 -08:00
Ian Gilman
2b9a51036f Fixed change detection for viewport (after recent spring change) 2015-01-20 16:09:54 -08:00
Mark Salsbery
1151a9343e Merge branch 'master' into navigator_disable
Conflicts:
	changelog.txt
2015-01-20 14:01:45 -08:00
Mark Salsbery
674a208d95 Replace base class innerTracker instead of using a new one 2015-01-20 13:56:06 -08:00
Mark Salsbery
912f82d36d IE 11 fix and Merge branch 'master' into mousetracker_MSPointerEvent
Conflicts:
	changelog.txt
2015-01-20 13:28:30 -08:00
Ian Gilman
897a237807 Added viewport-change event; fixed spring reset 2015-01-20 11:23:34 -08:00
Mark Salsbery
198d4de0e6 Added setMouseNavEnabled() and isMouseNavEnabled() method overrides to Navigator (#572) 2015-01-20 11:01:09 -08:00
Mark Salsbery
3b01014ac8 Fixed pointer event model detection for IE 10 (#571) 2015-01-20 10:26:14 -08:00
Mark Salsbery
e87020cf78 Removed 'position' property from MouseTracker keyDownHandler/keyUpHandler/keyHandler functions
Positional data is not available in the corresponding DOM event objects
2015-01-20 09:48:28 -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
Ian Gilman
1765e3c0c9 Merge pull request #537 from bitjutsu/bug-500-keyboard-nav
fix #500 - requests keyboard focus when canvas is clicked
2015-01-16 16:58:11 -08:00
Mark Salsbery
2831771af5 MouseTracker - keyboard handling
1) MouseTracker - added keydown and keyup handlers
2) Modifier keys ignored in keyboard  navigation handlers (#503)
3) Arrow key navigation fixed across platforms (#565)
2015-01-16 16:26:30 -08:00
Mark Salsbery
8e5e2168c8 Ensure capture released in abortTouchContacts() 2015-01-16 08:33:34 -08:00
Ian Gilman
c55daff222 Merge pull request #553 from openseadragon/ajax
Allowing XHRs withCredentials for authenticated requests
2015-01-15 14:35:06 -08:00
Mark Salsbery
00aae52a08 Fix container-enter/container-exit event properties 2015-01-15 12:37:54 -08:00
Mark Salsbery
cb56e352cf Mousetracker Improvements
1) MouseTracker - Simulated touchenter/touchleave events now bubble to parent element MouseTrackers
2) MouseTracker - Improved multitouch support in enter/exit event handlers
3) MouseTracker - orphaned tracked touch pointers removed (fix for #539)
4) MouseTracker - removed touchenter/touchleave event support since the events don't exist on any known platform and have been removed from the W3C specification
5) Removed Viewer onContainerPress/onContainerRelease handlers (and the associated 'container-release' event ) that were never fired due to the canvas (child) element capturing the DOM events
6) Added 'canvas-enter', 'canvas-exit', and 'canvas-press' events to Viewer
7) ButtonGroup - removed obsolete MouseTracker event handlers
2015-01-15 12:15:22 -08:00
Ian Gilman
3232ba4fe5 * Fixed an error in fitBounds if the new and old bounds were extremely close in size 2015-01-14 17:06:18 -08:00
Mark Salsbery
d26d3f9393 MouseTracker - Improved IE 9+ compatibility 2015-01-14 08:44:14 -08:00
Ian Gilman
e4c3dfc8dd Added Rect.union; allowed minZoomLevel greater than home zoom 2015-01-13 15:31:52 -08:00
Ian Gilman
ef20ccc1e7 Merge branch 'collections' into m2 2015-01-13 14:12:14 -08:00
Ian Gilman
17b8f356ed Merge branch 'master' into collections 2015-01-13 14:11:52 -08:00
Ian Gilman
373631ae32 Merge branch 'collections' into m2 2015-01-12 16:47:39 -08:00
Mark Salsbery
0d6fca35c1 Fix pointer type passed to capturePointer/releasePointer in pointer events model.
Remembered to change the test shim as well.
2015-01-12 16:08:26 -08:00
Mark Salsbery
e4c549927b Merge remote-tracking branch 'upstream/master' into mousebuttons479
Conflicts:
	changelog.txt
2015-01-12 15:36:19 -08:00
Mark Salsbery
83ff365121 Revert "capturePointer()/releasePointer() call fix for pointer event model"
This reverts commit d582a9563f.
2015-01-12 15:33:51 -08:00
Mark Salsbery
1c465ec59c Revert "Second attempt: capturePointer()/releasePointer() call fix for pointer event model"
This reverts commit 1bdb83dc58.
2015-01-12 15:33:18 -08:00
Ian Gilman
a411215eba Merge branch 'master' into collections
fixedConflicts:
	src/openseadragon.js
2015-01-12 14:31:20 -08:00
Ian Gilman
83b7d7597a Added a note about preserveOverlays 2015-01-12 14:22:10 -08:00
Ian Gilman
753bf64e8a * Fixed: DZI tilesource was broken 2015-01-12 14:18:39 -08:00
Ian Gilman
0fd94bb048 Merge branch 'master' into collections
fixed Conflicts:
	changelog.txt
	src/viewer.js
2015-01-12 14:10:49 -08:00
Mark Salsbery
1bdb83dc58 Second attempt: capturePointer()/releasePointer() call fix for pointer event model 2015-01-12 12:56:18 -08:00
Mark Salsbery
d582a9563f capturePointer()/releasePointer() call fix for pointer event model 2015-01-12 12:26:38 -08:00
Mark Salsbery
755854d3f7 Renamed non-primary button events/handlers 2015-01-12 11:02:54 -08:00
Mark Salsbery
30b5ec04c6 MouseTracker Improvements
* Exposed secondary pointer button (middle, right, etc.) events from MouseTracker and through viewer (#479)
* MouseTracker - Improved IE 8 compatibility
2015-01-10 14:49:02 -08:00
Younes El Alami
1d16b01a28 Changed _this.source.overlays to _this.overlays, https://github.com/openseadragon/openseadragon/pull/561/files#r22730318 2015-01-10 12:11:45 +00:00
Ian Gilman
4fa6fea850 Scrollwheel for thumbs (m2) 2015-01-09 11:45:53 -08:00
Younes El Alami
9e07c96d29 Added preserveOverlays option to Viewer 2015-01-09 02:21:16 +00:00
Ian Gilman
a336b23667 Documentation for ajaxWithCredentials-related changes 2015-01-02 16:07:11 -08:00
Ian Gilman
c820f9f918 Added ajaxWithCredentials option 2015-01-02 15:45:46 -08:00
Ian Gilman
56ee5bd3c5 Viewport and tiledImage test fixes 2015-01-02 14:24:05 -08:00
Ian Gilman
a7d9f7dcd5 Fixed broken defaultZoomLevel and homeFillsViewer options 2015-01-02 11:44:35 -08:00
Ian Gilman
cd329016bb Merge branch 'collections' into bugs 2015-01-02 11:19:44 -08:00
Ian Gilman
48eaf7c805 Merge branch 'master' into collections 2014-12-31 15:17:43 -08:00
Mark Salsbery
b39d31a845 MouseTracker - Added explicit pointer capture for touch event model events 2014-12-31 14:30:10 -08:00
Ian Gilman
68dfc79101 Merge branch 'collections' into bugs 2014-12-31 11:16:33 -08:00
Ian Gilman
0edef40db2 Merge branch 'master' into collections 2014-12-31 11:13:27 -08:00
Mark Salsbery
8d4c776cd0 MouseTracker fixes for #502, #518, #527, #539 2014-12-30 12:57:17 -08:00
Ian Gilman
b141a22c87 Merge pull request #544 from kim-company/fix-imageloader
Fix the jobLimit of the imageLoader
2014-12-29 11:48:20 -08:00
Adam Carruthers
6e49f80248 Prevent mobile keyboard from opening
Adds readonly property to .keyboard-command-area to prevent
input, but allow keys to be captured.
2014-12-22 20:29:44 -07:00
Philip Giuliani
b8a7d33ebb Fix documentation of jobLimit 2014-12-22 08:51:57 +01:00
Ian Gilman
c9708399a1 Fixed bug with passing single literal tilesource on construction 2014-12-19 15:32:19 -08:00
Ian Gilman
f1610425bc Navigator now updates when items are moved 2014-12-19 13:57:08 -08:00
Ian Gilman
c0163f7d6b Merge branch 'collections' into bugs
fixed Conflicts:
	test/demo/collections/main.js
2014-12-19 11:58:41 -08:00
Philip Giuliani
71cbd84879 Fix case of filename
All files are downcased so far.
2014-12-19 16:06:21 +01:00
Philip Giuliani
b82f5cea76 Fixed imageLoaderLimit
Currently jobsInProgress was not incremented after adding a job. So it
has gone into the - range and was like unlimited jobs.
2014-12-19 15:50:19 +01:00
Philip Giuliani
c737bad66e Fix the jobLimit of the imageLoader
Fixes #490
2014-12-19 15:17:15 +01:00
Ian Gilman
e98d47e3ce Fixed erroneous "undefined" asserts 2014-12-18 15:21:48 -08:00
Adam Carruthers
69e9326d4f fix #500 - requests keyboard focus when canvas is clicked
The canvas click listener will now check if keyboard-command-area has
focus, and if it does not, it will request it.
2014-12-04 17:06:33 -05:00
Ian Gilman
28b1296105 IE8 fixes for DZI and World.removeItem 2014-12-04 12:00:04 -08:00
Ian Gilman
6b0e44d037 Merge branch 'collections' into ian2
fixed Conflicts:
	test/demo/collections/main.js
2014-12-03 13:37:44 -08:00
Ian Gilman
211127b87b Fixed window resize for navigator with multi-image 2014-12-03 11:13:06 -08:00
Ian Gilman
09e494091e More fixes for tiledImage animation 2014-12-02 13:17:56 -08:00
Ian Gilman
6a7f56d858 tiledImage bounds animation now works 2014-12-02 11:44:02 -08:00
Ian Gilman
7078826be1 Auto-resize now works for multi-image 2014-12-01 16:29:21 -08:00
Ian Gilman
4e788473b0 image springs start 2014-11-24 17:47:16 -08:00
Ian Gilman
bf9ccd5458 tile-drawing event now includes tiledImage 2014-11-24 13:25:20 -08:00
Ian Gilman
2de44c752d Using "viewport coordinates" instead of "world coordinates" 2014-11-24 11:59:06 -08:00
Ian Gilman
66517dab8d Coordinate conversion rounding errors were causing test breakages; fixed 2014-11-24 11:46:33 -08:00
Ian Gilman
d5c345970c Coordinate conversion functions for TiledImage 2014-11-21 16:32:04 -08:00
Ian Gilman
2a5fd0b0f7 Fixed "toImage" converters 2014-11-21 15:18:25 -08:00
Ian Gilman
2336b81618 TiledImage update events now include which tiled image 2014-11-20 16:41:43 -08:00
Ian Gilman
36831d3434 Testing deprecations 2014-11-20 16:02:02 -08:00
Ian Gilman
68fbdc7beb * Overlays appear in the DOM immediately on open or addOverlay (#507) 2014-11-20 15:33:13 -08:00
Ian Gilman
78f65152bc Fixed: overlays were appearing under the canvas 2014-11-20 14:50:07 -08:00
Ian Gilman
78e44d487b TileCache tests 2014-11-20 11:51:24 -08:00
Ian Gilman
3449ba1961 tiledImage tests 2014-11-18 17:12:15 -08:00
Ian Gilman
b7c78812c5 Items added with addTiledImage are now added in correct sequence 2014-11-18 15:45:03 -08:00
Ian Gilman
643332902d Unit tests for World 2014-11-17 16:24:40 -08:00
Ian Gilman
0e31b67ca5 ReferenceStrip fixes 2014-11-17 14:03:14 -08:00
Ian Gilman
336482cd1c Viewer.open now honors sequence mode 2014-11-17 12:57:49 -08:00
Ian Gilman
f018059b60 Docs for sequence mode 2014-11-17 11:50:20 -08:00
Ian Gilman
1279c6766c More sequence mode work 2014-11-14 17:19:04 -08:00
Ian Gilman
0dd97dbc56 First version of sequence mode 2014-11-14 16:51:02 -08:00
Ian Gilman
b371af712e Fixed broken test 2014-11-14 15:49:42 -08:00
Ian Gilman
9347cfe692 Event handler cleanup for tiled images in world 2014-11-12 16:44:11 -08:00
Ian Gilman
1ed80b0d27 Docs and naming changes for collection mode 2014-11-12 16:31:46 -08:00
Ian Gilman
c4c17db045 Supporting collectionTileSize and collectionTileMargin 2014-11-12 15:48:38 -08:00
Ian Gilman
56ddf8c9c3 First steps for collection mode 2014-11-11 17:14:48 -08:00
Ian Gilman
1159711e26 Fixed broken navigator unit test 2014-11-10 16:25:17 -08:00
Ian Gilman
e02a2d55cc Fixed issue with navigator size when viewer is zero size to start 2014-11-10 15:53:38 -08:00
Ian Gilman
55759a6906 Merge branch 'master' into collections 2014-11-10 14:39:43 -08:00
Ian Gilman
7fcdbf210e One extra merge conflict 2014-11-07 17:15:11 -08:00
Ian Gilman
30a1005fb8 Merge branch 'master' into merger
fixed Conflicts:
	src/drawer.js
2014-11-07 17:13:48 -08:00
Ian Gilman
b15b94799c Merge branch 'issue-464' of github.com:SupplyFrame/openseadragon into SupplyFrame-issue-464 2014-11-07 15:48:57 -08:00
Ian Gilman
fab33ea1af Merge branch 'imageLoaderPatch' of github.com:rdlester/openseadragon into rdlester-imageLoaderPatch
fixed Conflicts:
	src/drawer.js
2014-11-07 15:29:34 -08:00
Ian Gilman
b5a9116a0b Fixed rotation with multiple images 2014-11-05 16:39:35 -08:00
Ian Gilman
8bdc55bd63 Fixed fitVertically and fitHorizontally 2014-11-05 15:57:44 -08:00
Ian Gilman
a9c9478752 Wraparound now works for images of other widths than 1 2014-11-05 15:24:31 -08:00
Ian Gilman
e52e2fef34 Improved docs 2014-11-05 14:48:37 -08:00
Ian Gilman
8641279890 Better tile caching for duplicate images 2014-11-05 13:48:27 -08:00
Ian Gilman
8466a91470 One more doc fix 2014-11-04 11:57:58 -08:00
Ian Gilman
d346d165f8 Updated documentation 2014-11-04 11:53:39 -08:00
Ian Gilman
31c15aed69 Merge branch 'collections' into ian
fixed Conflicts:
	src/viewer.js
	test/demo/collections/main.js
2014-11-04 09:58:09 -08:00
Ian Gilman
43292c9bcb Merge branch 'collections' into margins 2014-11-04 09:42:45 -08:00
Ian Gilman
de2d473db6 Merge branch 'master' into collections
fixed Conflicts:
	test/test.html
2014-11-04 09:41:28 -08:00
Ian Gilman
00c2881c64 Fixed test breakages 2014-11-03 17:14:17 -08:00
Ian Gilman
f8156991ef More doc tweaks 2014-10-29 17:23:54 -07:00
Ian Gilman
a68be6ac68 You can now open multiple images when creating via OpenSeadragon() 2014-10-29 17:14:46 -07:00
Ian Gilman
72aa6c4669 Docs for Viewer.open() 2014-10-29 17:06:14 -07:00
Ian Gilman
4d6be50c05 More cleanup for open() changes 2014-10-29 16:39:43 -07:00
Ian Gilman
95836a6ad1 Major overhaul to Viewer.open() 2014-10-29 16:11:21 -07:00
nein09
19844c8f42 Incorporate code review feedback, add a times method to the Rect class. 2014-10-29 09:42:19 -07:00
Ben Delarre
61d757e86b Merge branch 'master' into issue-465 2014-10-27 14:07:10 -07:00
Ian Gilman
fb6280644a Merge branch 'collections' into margins
fixed Conflicts:
	test/demo/collections/main.js
2014-10-24 15:27:14 -07:00
Ian Gilman
3e1870cde0 Navigator now updates for item index changes and removals 2014-10-24 15:18:32 -07:00
Ian Gilman
46cd2ab800 Fixed issue with top/left margins; cleaned up naming 2014-10-21 17:11:09 -07:00
Ian Gilman
a14bea39aa More margins work 2014-10-17 14:27:24 -07:00
Ian Gilman
2a7f48ef60 Cleanup and docs for margins 2014-10-16 15:19:05 -07:00
Ian Gilman
2d8652046a First stab at margins 2014-10-16 14:00:07 -07:00
Ian Gilman
a08e361512 Navigator following host viewer's world events 2014-09-24 13:58:09 -07:00
Ian Gilman
e02209092c Navigator now works with multiple images 2014-09-23 16:15:03 -07:00
Ben Delarre
1d1b9bf01a Added support for pointer API so this now works in IE11. 2014-09-23 14:31:53 -07:00
Ben Delarre
f07108ec2d Updated implementation to better pass tests, still not 100% though. 2014-09-23 11:26:42 -07:00
Ian Gilman
63996a7d92 Merge branch 'master' into collections
fixed Conflicts:
	src/viewport.js
2014-09-17 16:05:23 -07:00
iangilman
356b7e1f5f Merge pull request #474 from nein09/issue-127
Add option for home button to fill viewer (issue 127)
2014-09-15 13:24:55 -07:00
Ben Delarre
7278793e5c Fixed notation for travis build. 2014-09-12 16:22:55 -07:00
Ben Delarre
2a8cb43d02 Fixes issue #464 by adding mouseout handler to document and calling mouseUp handler 2014-09-12 16:01:19 -07:00
nein09
b0613a5971 Revert "Merge remote-tracking branch 'origin/issue-127' into issue-127"
oh god help

This reverts commit ffa2ee1e8d, reversing
changes made to 2163e5230c.
2014-09-12 15:31:05 -07:00
nein09
8b368f72f7 I somehow missed saving the jsdoc change in my last commit. 2014-09-12 14:50:43 -07:00
nein09
9b66eeee99 Merge remote-tracking branch 'origin/master' into issue-127 2014-09-12 10:41:19 -07:00
nein09
741978caf9 Incorporate code review feedback for Openseadragon isue 127. Added appropriate default values and docs to openseadragon.js; restored a blank line that I accidentally deleted. 2014-09-12 10:33:48 -07:00
Rob Sanderson
d6c3ccfd31 scale_factors -> scaleFactors in 2.0 API 2014-09-04 12:04:31 -07:00
nein09
2e4e187b21 Adding functionality for https://github.com/openseadragon/openseadragon/issues/127 - option for home button to fill rather than fit.
- Added a option to pass to the OpenSeadragon constructor called homeFillsViewer, which defaults to false. If true, the home button will fill the viewer with the image, centered on the image's center, zoomed to fill the viewer at the image's smallest dimension, and clipped at the image's largest dimension. For example, a very tall, thin image in a 4:3 aspect ratio viewer will zoom so that the width of the image fills the viewer, and most of the height of the image is clipped.
2014-08-29 11:53:29 -07:00
Ian Gilman
6f0f23e728 Fixed constraints for when homeBounds.x or y is negative 2014-08-26 15:12:49 -07:00
Ian Gilman
5a1a41428b Merge branch 'master' into collections
fixed Conflicts:
	src/drawer.js
2014-08-26 11:53:03 -07:00
iangilman
b8c5d62782 Merge pull request #468 from PathXL/rotate-pinch
Implements pinch rotate.
2014-08-26 10:45:17 -07:00
iangilman
ff2e0a1c55 Merge pull request #466 from PathXL/free-hand-rotation
Allow all rotation angles
2014-08-26 10:44:37 -07:00
Dominik Picheta
e9382ffbf7 Fixes doc comment. 2014-08-26 14:56:24 +01:00
Dominik Picheta
0ff6eb443d Added pinchRotate option. 2014-08-22 15:22:00 +01:00
Dominik Picheta
c3b292cfb1 Fix code style issue. 2014-08-22 14:57:20 +01:00
Ian Gilman
52aa693531 Merge branch 'master' into collections 2014-08-21 10:13:13 -07:00
Ian Gilman
7b80263718 Reinstating a small check. 2014-08-21 10:11:21 -07:00
Dominik Picheta
097714cf39 Implements pinch rotate. 2014-08-20 12:03:42 +01:00
Dominik Picheta
ea80c05a05 Replace error for non right-angle rotations in Rect.rotate. 2014-08-20 09:21:02 +01:00
Ian Gilman
1f13d1f909 Moved update-viewport event 2014-08-19 15:43:36 -07:00
Ian Gilman
33f0fa1e4b World cleanup; viewer layer function deprecation 2014-08-19 15:02:04 -07:00
rlskoeser
fd0d8d4507 always use getElementsByTagNameNS since it will work for DZI xml with or without ns prefix 2014-08-19 13:47:51 -04:00
Dominik Picheta
1c63c96f04 Increase viewport bounds slightly for rotation. 2014-08-19 15:56:23 +01:00
Dominik Picheta
a8b6c8d0e1 Merge branch 'master' into free-hand-rotation 2014-08-19 10:00:12 +01:00
Dominik Picheta
e00e4c53ef Proper viewport bounds changes for rotation. 2014-08-19 09:51:27 +01:00
Ian Gilman
8efad6f3a0 Fixed home/constraints for multi-image. 2014-08-18 16:04:49 -07:00
rlskoeser
343f9ed367 correct typo in fallback ns logic for pulling display rect nodes 2014-08-18 14:37:37 -04:00
rlskoeser
0d92737ff2 check length instead of undefined for DisplayRect nodes tagname ns fallback 2014-08-18 14:17:37 -04:00
rlskoeser
df90308b0e use getElementsByTagNameNS for namespaced DZI xml when getElementsByTagName fails 2014-08-18 14:10:36 -04:00
Ian Gilman
26e9575f41 Merge branch 'collections' into ian 2014-08-15 14:50:19 -07:00
Ian Gilman
1cc29db432 Merge branch 'master' into collections
fixed Conflicts:
	src/viewport.js
2014-08-15 14:49:56 -07:00
iangilman
e93578fa54 Merge pull request #455 from PathXL/fixes-192
Fixes #192.
2014-08-15 09:59:28 -07:00
Dominik Picheta
50f9a82089 Small rotation fixes. 2014-08-15 15:47:50 +01:00
Dominik Picheta
01303787ce Cleanup. 2014-08-15 09:46:27 +01:00
rlskoeser
8662bf9496 use localName instead of tagName, to support dzi xml with namespaces 2014-08-14 18:06:29 -04:00
Dominik Picheta
3353bd5f69 Support other rotation angles. 2014-08-13 15:52:20 +01:00
Dominik Picheta
873135b492 Adds rotate event. Fixes #454. 2014-08-13 10:53:52 +01:00
Ian Gilman
5c7c1d5b6c Moved Viewport.goHome to Viewer.goHome. 2014-08-12 16:44:53 -07:00
Ian Gilman
66b8d7e191 Previous cleanup was a little too aggressive. 2014-08-12 16:15:17 -07:00
Ian Gilman
2ee59635fa World.getHomeBounds() 2014-08-12 16:04:55 -07:00
Dominik Picheta
afd8b48d6b Fixes #192.
Navigator can now rotate together with the viewer.
2014-08-12 15:27:16 +01:00
Ian Gilman
45b7118732 Further cleanup 2014-08-11 17:04:20 -07:00
Ian Gilman
94080c3180 Cleaned up tileCache code. 2014-08-08 16:32:43 -07:00
Ian Gilman
f04d538b5b Deprecated layer functions in viewer; additional cleanup. 2014-08-08 16:15:23 -07:00
Ian Gilman
d86edff931 Merge branch 'collections' into ian
fixed Conflicts:
	src/drawer.js
2014-08-08 11:38:13 -07:00
Ian Gilman
82637d95a5 Merge branch 'master' into collections 2014-08-08 11:32:14 -07:00
Dominik Picheta
a2334353f7 Merge branch 'master' into fix-195 2014-08-08 12:19:48 +01:00
Dominik Picheta
29b69a9e83 Fixes #195: debug feature now works with rotation. 2014-08-08 12:18:05 +01:00
Ian Gilman
b43ac582dc Merge branch 'collections' into ian 2014-08-07 10:06:44 -07:00
Ian Gilman
00c7315989 Merge branch 'master' into collections
fixed Conflicts:
	src/viewport.js
2014-08-07 10:06:15 -07:00
iangilman
c9c973276f Merge pull request #452 from PathXL/flick-after-rotate-fix
Fixes incorrect flick direction after image is rotated.
2014-08-07 10:03:12 -07:00
Dominik Picheta
a672ca9785 Fixes incorrect flick direction after image is rotated. 2014-08-07 10:50:38 +01:00
Ian Gilman
dbb60c0ab2 Splitting drawer into drawer/tileCache/tiledImage; adding World 2014-08-06 13:48:18 -07:00
Ian Gilman
973ef29d66 Copied drawer.js to tiledImage.js 2014-08-06 13:38:56 -07:00
Mark Salsbery
1d5b059fcc Call Viewport.applyConstraints() on drag-end when flick gesture is enabled 2014-08-06 11:26:18 -07:00
Mark Salsbery
ee3ab70025 Combined redundant captureMouse()/capturePointer() and releaseMouse()/releasePointer() functions 2014-08-06 10:49:42 -07:00
Mark Salsbery
e9b7634499 Added $.setElementTouchActionNone function 2014-08-05 16:57:54 -07:00
Mark Salsbery
be13d25a26 Removed debug code 2014-08-05 16:17:40 -07:00
Mark Salsbery
bf19e73f5e touch-action fixup 2014-08-05 16:01:43 -07:00
Mark Salsbery
3521bac90e Fixed pointer event capture, Cleaned up debug code 2014-08-05 13:56:18 -07:00
Mark Salsbery
4152b8b866 Trailing whitespace fixes 2014-08-05 07:13:06 -07:00
Mark Salsbery
c6bea68b4e Merge branch 'master' into IE9-MouseTracker-Clicks 2014-08-05 07:00:05 -07:00
Mark Salsbery
e11095968c Mousetracker Over/Out Tracking Fixes 2014-08-04 21:41:07 -07:00
Ian Gilman
6066fa2eeb Cleanup and docs. 2014-07-31 16:17:46 -07:00
Ian Gilman
48603ba260 Drawer creation now supports width or height rather than scale. 2014-07-31 15:54:20 -07:00
Ian Gilman
298bcc25fb Merge branch 'master' into ian 2014-07-30 09:26:15 -07:00
Rob Sanderson
59225a7250 Missed a Multi in a comment again :( 2014-07-29 11:16:23 -07:00
Rob Sanderson
92d5f72ceb Missed a Multi in a comment 2014-07-29 11:15:14 -07:00
Rob Sanderson
8a6a111698 Documentation and &copy; fix 2014-07-29 11:12:05 -07:00
Rob Sanderson
69bf069038 navigator to request maxLevel tileSize 2014-07-28 12:17:45 -07:00
Rob Sanderson
984fb8c531 Fixed drawer, renamed source, fixed tests 2014-07-28 11:53:06 -07:00
Rob Sanderson
2c4440b5a2 Combined IIIF tilesource and dynamic tileSize 2014-07-25 16:31:13 -07:00
Ian Gilman
f97202833f Merge branch 'master' into ian
fixed Conflicts:
	src/viewport.js
2014-07-24 09:40:43 -07:00
iangilman
1e4288f770 Merge pull request #423 from henri-astre-msft/fitBoundsWithConstraints
add fitBoundsWithConstraints() to the viewport.
2014-07-24 09:28:53 -07:00
Ian Gilman
a3973a25e7 Added scaling to drawer. 2014-07-22 11:13:22 -07:00
Ian Gilman
ea6ee54136 Added x and y to drawer. 2014-07-17 16:24:28 -07:00
Ryan Lester
43f8dc74ea Fixing CORS bug 2014-06-26 11:33:43 -07:00
Henri Astre
318071d3ce Cleanup for PR comments
- raise 'constrain' event inside applyBoundaryConstraints
- fix demo title/filename
- various fixes (default immediately to false + add private for
documentation)
2014-06-23 16:10:01 -07:00
Henri Astre
9e6c46d484 Revert "hiding properly _ functions."
This reverts commit 118c2b2c87.
2014-06-23 15:40:36 -07:00
Henri Astre
118c2b2c87 hiding properly _ functions. 2014-06-20 17:53:07 -07:00
Henri Astre
e67f6b4003 First attempt at removing duplicated code
I've created _applyBoundaryConstraints() and _fitBounds() to remove
duplicated code.
2014-06-20 13:44:59 -07:00
Henri Astre
f86f9063fd Improve comment for destroy() method. 2014-06-18 12:56:36 -07:00
Henri Astre
48aded3824 add fitBoundsWithConstraints() to the viewport. 2014-06-18 11:11:34 -07:00
Henri Astre
a563bdb658 fix .close() called after .destroy() + spacing 2014-06-18 10:35:23 -07:00
Henri Astre
764fa3e34a Fix memory leak while destroying the viewer. 2014-06-17 17:26:10 -07:00
iangilman
e4800a9455 Merge pull request #419 from esmondb/master
Removes unnecessary trailing commas which stops google's closure compile...
2014-06-16 09:11:24 -07:00
esmondb
59ab6562d3 Removes unnecessary trailing commas which stops google's closure compiler. 2014-06-14 10:15:40 +01:00
Ian Gilman
02b606680d Updated to latest npm packages 2014-06-02 11:02:22 -07:00
esmondb
d9ddc5f65d Fix for IIPServer style urls when using DZI. 2014-05-31 08:30:25 +01:00
Ryan Lester
06dcfadf20 Quick patch to fix mid-update image loaded callbacks 2014-05-21 18:29:40 -07:00
Ryan Lester
dd51df97ab Added ImageLoader; loads batches of images using async queue pattern 2014-05-10 15:09:02 -07:00
Mark Salsbery
bd11af6571 Improved Viewer Options Support in Gesture Handling
Apply constrainDuringPan option in flick and drag gesture handling.
Apply panHorizontal and panVertical options in flick and pinch gesture
handling.
2014-05-06 11:39:02 -07:00
Mark Salsbery
5b995eb04b Removed mousenter/mouseleave DOM Event Handling
Fixes #394

mouseenter/mouseleave are not implemented in Webkit very well, so
reverted to mouseover/mouseout.
2014-05-02 23:01:38 -07:00
iangilman
af383668d4 Merge pull request #392 from msalsbery/Double-Tap
Add Double-Click/Tap Gesture to MouseTracker (#300)
2014-04-28 10:01:23 -07:00
iangilman
f0c92146d1 Merge pull request #385 from msalsbery/IE-Browser-Detection
Fix for IE 11 Browser Detection
2014-04-28 09:57:04 -07:00
Mark Salsbery
5806eed7f4 Merge remote-tracking branch 'origin/master' into IE-Browser-Detection 2014-04-24 12:50:21 -07:00
Mark Salsbery
6df9368f2c Merge remote-tracking branch 'origin/master' into Firefox-Unit-Tests 2014-04-24 12:49:58 -07:00
Mark Salsbery
8232546d51 Merged upstream changes, fixed conflicts 2014-04-24 12:40:49 -07:00
iangilman
c0a3333663 Merge pull request #387 from msalsbery/Touch-Enter-Event
MouseTracker Touch Fixes - Flick Defaults and Bubbling
2014-04-24 10:32:35 -07:00
iangilman
669925776a Merge pull request #379 from avandecreme/ajax-file
Fix ajax call for file: and ftp: #73
2014-04-24 10:02:44 -07:00
Mark Salsbery
bd52f38788 iOS touch enter/exit fix for BUttonGroup 2014-04-23 08:38:55 -07:00
Mark Salsbery
d9dfd0a435 iOS touch enter/exit fix 2014-04-23 08:07:48 -07:00
Mark Salsbery
e900b605af Update changelog.txt
Updated changelog.

Misc documentation fixes.
2014-04-22 09:41:29 -07:00
Mark Salsbery
7567a657bd Add Double-Click/Tap Gesture to MouseTracker (#300)
Fix for enhancement #300
Added double-click/tap gesture detection to MouseTracker.with
corresponding dblClickHandler event callback.
Added unit test for double-click detection.
Added Viewer dblClickHandler handling to optionally zoom on
double-click.
2014-04-22 09:23:56 -07:00
Antoine Vandecreme
e7ca7b1e95 Prefer DOMParser over ActiveX when both are availables. 2014-04-21 09:23:17 -04:00
Mark Salsbery
765df51bd3 Stiffened the spring 2014-04-20 21:25:29 -07:00
Mark Salsbery
5860167d65 MouseTracker Touch Fixes - Flick Defaults and Bubbling
Flick gesture settings defaults set to better values.
Removed touch event model bubble cancelling so viewer controls show on
touch contact.
2014-04-20 18:19:32 -07:00
Mark Salsbery
8589ebef0d Fix for IE 11 Browser Detection
Proposed temporary fix until we don't need browser  sniffing anymore.
2014-04-19 12:10:48 -07:00
Mark Salsbery
1e80b5a916 Float to Integer Fix for 'px' values in Navigator
Also fixes unit tests on Firefox (#332)
2014-04-19 11:48:26 -07:00
Antoine Vandecreme
6a24af3743 Add @private to internal methods. 2014-04-18 16:59:47 -04:00
Antoine Vandecreme
116cf7449f Test if activex is available by trying to create one for ie11 compatibility. 2014-04-17 17:20:04 -04:00
Antoine Vandecreme
3b4dca329d Use ActiveX on IE when requesting a file: URL with ajax. 2014-04-17 16:13:26 -04:00
Mark Salsbery
8e119d66e5 Minor naming changes 2014-04-16 06:40:19 -07:00
Mark Salsbery
c2e7b376b0 pinchToZoom gesture option added, misc. fixes
changelog update.
pinchToZoom gesture option added.
Event unit tests cleaned up.
2014-04-15 19:19:47 -07:00
Mark Salsbery
9b15ca090b Fallback to mouseover/mouseout, 2014-04-15 13:04:08 -07:00
Antoine Vandecreme
47ae094675 Fix ajax call for file: and ftp: #73 2014-04-15 12:55:32 -04:00
Mark Salsbery
e8e0f28f5a Merge Upstream Changes 2014-04-15 06:40:46 -07:00
Mark Salsbery
09bfd55add MouseTracker fixes and tests
Separated event-model/device specific event handling code from
event-model/device agnostic event handling code.
Use enter/leave events instead of over/out events.
Updated unit tests for above changes.
Added unit tests for mouse gestures.
Updated changelog for breaking changes and deprecations.
2014-04-14 18:17:18 -07:00
Heath Nielson
c61a22f750 Support query parameters in DZI tileSource URLs
Any query parameters that are a part of the tileSource URL are added
to the tile URLs.
2014-04-10 14:08:19 -06:00
Ian Gilman
5dafa32f5d Changelog for #376 and spelling fix 2014-04-09 09:06:46 -07:00
iangilman
a2a5387a83 Merge pull request #376 from avandecreme/hide-controls
Add showZoomControl, showHomeControl and showFullPageControl options to ...
2014-04-09 09:04:35 -07:00
Antoine Vandecreme
e27df5327f Improve documentation. 2014-04-09 10:18:51 -04:00
iangilman
59a00ddfd1 Merge pull request #377 from avandecreme/cors
Disable CORS by default.
2014-04-08 14:28:41 -07:00
Antoine Vandecreme
dbe87d659e Disable CORS by default. 2014-04-07 16:59:48 -04:00
Antoine Vandecreme
16ee82d43b Add showZoomControl, showHomeControl and showFullPageControl options to be able to hide specific controls. See #210
Add missing doc for buttons.
Set the rotate buttons to viewer.rotate(Left/Right)Button for coherence with other buttons.
Update tests.
2014-04-07 14:11:33 -04:00
Antoine Vandecreme
f7d65fa4cb Make OpenSeadragon W3C compliant. 2014-04-04 16:14:32 -04:00
Mark Salsbery
642c302225 Changelog, documentation, options update 2014-04-03 10:06:12 -07:00
Mark Salsbery
dc48a31412 Exposed gesture settings as options 2014-04-03 08:50:25 -07:00
Mark Salsbery
b8ea87d3f8 MouseTracker Fixes
Fixed mouse capture, should work on IE8 without IE8-specific code.
2014-04-01 18:27:54 -07:00
Mark Salsbery
2c8af72f5e Multi-Touch MouseTracker Fixes
Removed zoom on click for touch.
Added an isPrimary flag to gesture points.
Fixed documentation error and updated documentation and comments.
Implemented the stopHandler for mouse events.
2014-04-01 09:32:04 -07:00
Mark Salsbery
8df20a5b86 Multi-Touch MouseTracker Update
Removed artifact
2014-03-31 13:42:19 -07:00
Mark Salsbery
d324aea761 Multi-Touch MouseTracker Update
Refactored, fixed a couple bugs, unit tests working.

Issuing a pull request.
2014-03-31 12:54:37 -07:00
Mark Salsbery
73b7519471 Merge remote-tracking branch 'origin/master' into Pointer-Event-Model 2014-03-29 17:09:24 -07:00
Mark Salsbery
1475f5865d Multi-Touch MouseTracker Update
Ready to pull request, merging upstream changes and running tests.
2014-03-29 17:02:24 -07:00
iangilman
a4d877297e Merge pull request #367 from avandecreme/master
Fix missed copy paste.
2014-03-27 09:05:00 -07:00
Antoine Vandecreme
37bc36a7e7 Fix missed copy paste. 2014-03-26 15:28:35 -04:00
Antoine Vandecreme
7055322ee3 Add support for old webkit. Add fullScreenApi.getFullScreenElement method. Remove old license. 2014-03-25 13:29:58 -04:00
Antoine Vandecreme
6e48de47ed Remove useless parameter Element.ALLOW_KEYBOARD_INPUT 2014-03-25 11:59:48 -04:00
Antoine Vandecreme
009b75393f Remove ActiveX for IE<11. Update changelog. 2014-03-25 11:34:46 -04:00
Antoine Vandecreme
a15c8b035f Merge branch 'master' of https://github.com/openseadragon/openseadragon into fullscreen-inputs 2014-03-25 10:36:37 -04:00
Mark Salsbery
70716b0706 Merge remote-tracking branch 'origin/master' into Pointer-Event-Model 2014-03-24 14:47:18 -07:00
Antoine Vandecreme
639af65ea9 Remove duplicate method 2014-03-21 16:15:08 -04:00
Antoine Vandecreme
775f4eba25 Merge branch 'master' of https://github.com/openseadragon/openseadragon into optimization 2014-03-21 16:12:50 -04:00
Antoine Vandecreme
4a5ccea2f7 Update overlays unit tests. 2014-03-21 15:55:04 -04:00
Mark Salsbery
3c0ca21568 Merge remote-tracking branch 'origin/master' into Pointer-Event-Model 2014-03-21 11:54:28 -07:00
Mark Salsbery
f6dfe9b079 Multi-Touch MouseTracker Update 2014-03-21 11:45:20 -07:00
iangilman
184ba0dbea Merge pull request #364 from sul-dlss/cors-policy
add crossOriginPolicy drawer configuration to enable or disable CORS image requests
2014-03-21 09:18:41 -07:00
Antoine Vandecreme
4be56cdb52 Overlays performance optimization. See #359 2014-03-20 15:39:31 -04:00
Chris Beer
3d028716fe add crossOriginPolicy drawer configuration to enable or disable CORS image requests 2014-03-20 10:30:46 -07:00
Antoine Vandecreme
73eaf2ce96 Separate layers and overlays to ensure that overlays are always on top of layers. 2014-03-20 09:56:12 -04:00
Antoine Vandecreme
ba10c392a1 Merge branch 'master' into layers
Conflicts:
	src/drawer.js
	src/viewer.js
	test/test.html
2014-03-19 16:24:48 -04:00
Antoine Vandecreme
c9df575347 Merge from master 2014-03-18 13:17:43 -04:00
Antoine Vandecreme
2473c809b2 Fix mistakes in doc. 2014-03-18 13:05:21 -04:00
Antoine Vandecreme
a0cb7ec10f Fix fullscreen test on IE11 2014-03-17 17:33:26 -04:00
Antoine Vandecreme
3cfce81705 Update full screen API. 2014-03-17 17:01:36 -04:00
Mark Salsbery
d52df4a9bf Multi-Touch MouseTracker Update
Pinch gesture fixups
2014-03-15 17:12:13 -07:00
Antoine Vandecreme
7852718be2 Fix style 2014-03-15 11:51:36 -04:00
Antoine Vandecreme
41cded608c Use viewer.addOverlay instead of drawer.addOverlay in collection mode 2014-03-15 11:40:51 -04:00
Antoine Vandecreme
ecf10f5911 Fix test messages, add doc and factorize overlay object creation 2014-03-15 11:20:33 -04:00
Mark Salsbery
7aa0df1b66 Multi-Touch MouseTracker Update
Pinch zoom update
2014-03-14 14:15:09 -07:00
Mark Salsbery
38cae86659 Multi-Touch MouseTracker Update 2014-03-14 10:42:22 -07:00
Mark Salsbery
c7ea247baa Initial commit - Multi-touch, pointer event MouseTracker 2014-03-10 11:49:51 -07:00
iangilman
08568b5354 Merge pull request #341 from fs-webdev/rotate-buttons
Added Rotate Left/Right buttons to standard controls
2014-03-07 10:05:36 -08:00
Grant Echols
95f0591210 Added message to clarify that the event only fires when <canvas> is being used. 2014-03-04 10:38:10 -07:00
Grant Echols
e368bd50aa Added tests for rotate control on/off setting. 2014-03-03 14:45:30 -07:00
Grant Echols
5e0e8005d6 Tuned the configuration around the rotate left/right to work when the drawer is instantiated. 2014-03-03 11:14:09 -07:00
Grant Echols
60da75aede Added configuration around the rotate left/right buttons. The default for showRotationControls is false to preserve existing functionality. Also added default tooltip strings for the buttons.
This version runts the tests fine locally using 'npm test'. It looks like the remote build was having a timeout issue which I couldn't reproduce.
2014-03-03 09:28:28 -07:00
Antoine Vandecreme
0f43cd5a16 Add deprecated drawers methods. 2014-03-01 08:32:38 -05:00
Grant Echols
be79249c9c Added pre-draw event for tiles to allow applications to alter the image just prior to its rendering. This should enable invert, brightness, contrast, sharpen and other transformations to occur naturally through the 'tile-drawing' event listener.
The listener is given the 'rendered' object which is the pre-drawn image on a canvas context object. By altering the 'rendered' object the listener can alter the display results. Since this event gets fired multiple times for the tile, it is wise for the handler to track what their desired modifications are and to tag the 'tile' element to keep track of the modifications already applied.
2014-02-27 15:35:00 -07:00
Grant Echols
576df57cdc Fixed code style issue. 2014-02-20 14:04:26 -07:00
Grant Echols
2fd1a849d1 Added rotate right/left buttons to default tools 2014-02-20 13:57:39 -07:00
Antoine Vandecreme
95c7668f68 Pass degrees from the viewer to the viewport. Fix #305 2014-02-05 15:52:31 -05:00
Antoine Vandecreme
aaad805727 Add test for fixed overlay + update doc 2014-02-05 14:57:47 -05:00
Antoine Vandecreme
ed5eae9a73 Fix imageToViewerElementCoordinates method and corresponding unit tests. 2014-02-04 17:02:11 -05:00
Antoine Vandecreme
e26727488f Fix doc in point.js 2014-02-04 16:59:45 -05:00
Antoine Vandecreme
c4428db8a5 Fix crash when closing the viewer when no overlay has been added. 2014-01-31 11:49:44 -05:00
Antoine Vandecreme
695df873ca Update the source when the base layer change. 2014-01-30 16:59:51 -05:00
Antoine Vandecreme
d43b6d86b5 Add layersAspectRatioEpsilon check 2014-01-30 16:43:35 -05:00
Antoine Vandecreme
365dad9317 Move all overlay code from drawer to viewer 2014-01-30 15:38:37 -05:00
Antoine Vandecreme
7210181b4f Remove not working code 2014-01-29 16:31:13 -05:00
Antoine Vandecreme
53ec6889e0 Support removal of base layer. 2014-01-22 11:33:59 -05:00
Antoine Vandecreme
1c1cd0dc4d Allow base layer reassignment if not in sequence mode. 2014-01-21 19:24:47 -05:00
Mark Salsbery
601f533fcf Navigator update with tests update
Navigator hosted in viewer with navigatorMaintainSizeRatio==false (the
default) now maintains its area and aspect ratio.

Tests added for most (all?) navigator configurations.
2014-01-18 18:19:22 -08:00
Mark Salsbery
7ce552caf9 Navigator update
Allow navigators hosted in a user-supplied element to be styled by user.
2014-01-13 14:51:22 -08:00
Antoine Vandecreme
facccf7b45 Throw an error when trying to add a layer in collection mode. 2014-01-11 19:25:27 -05:00
Antoine Vandecreme
cd62ba7eca Prevent adding collections as layers. 2014-01-11 19:15:28 -05:00
Antoine Vandecreme
f0f76b847e Add viewer.getLayerAtLevel method and rename getLayerLevel to getLevelOfLayer.
Add layers unit test.
2014-01-11 18:08:04 -05:00
Antoine Vandecreme
56707bd4f7 Add viewer.getNumberOfLayers method
layers.html test file:
-display 2 layers after opening
-fix order
-add opacity demo
-add rotation demo
2014-01-11 12:52:44 -05:00
Mark Salsbery
23954d0adf Merge remote-tracking branch 'origin/master' into Navigator-Resize
Conflicts:
	changelog.txt
2014-01-08 14:03:47 -08:00
Jon Stroop
ddde07b614 style changes, per @iangilman on openseadragon/openseadragon#315 2014-01-07 14:59:44 -05:00
Antoine Vandecreme
63af1e7517 Uncomment version 2014-01-05 19:30:52 -05:00
Antoine Vandecreme
b542b90590 Fix $.indexOf pollyfill
Add the original options in addLayer events
Add layers demo page
2014-01-05 19:20:45 -05:00
Jon Stroop
24298dcbba Only require IIIF level 1; Vary tile size based on src image when no tiles are reported. Toward openseadragon/openseadragon#313 2014-01-02 19:59:10 -05:00
Jon Stroop
e9c2b502c1 support iiif level 1 2013-12-18 17:34:39 -05:00
Mark Salsbery
cae29bb144 Merge remote-tracking branch 'origin/master' into Navigator-Resize 2013-12-16 12:53:34 -08:00
Mark Salsbery
1cac9fa533 Navigator cursor fix 2013-12-16 07:17:35 -08:00
Mark Salsbery
1e9ea154f2 Added navigatorAutoResize option
Improved resizable navigator support.
2013-12-14 14:45:11 -08:00
Mark Salsbery
a189ba97d7 Update navigator on full-page/full-screen bug fix 2013-12-14 09:11:14 -08:00
Sean Wilkinson
03e82a7ca3 Corrected spelling in comments 2013-12-13 15:12:35 -06:00
Sean Wilkinson
3d1ba84c4d Corrected simple spelling mistakes in comments 2013-12-13 15:11:00 -06:00
Mark Salsbery
14acb5d581 ABSOLUTE Control bug fix
Wrapped ABSOLUTE positioned controls in a div so fade opacity would work
correctly.

Added 'navigator-scroll' event addition to changelog.
2013-12-13 11:55:36 -08:00
Mark Salsbery
3deb20271a Merge remote-tracking branch 'origin/master' into Navigator-Resize 2013-12-13 09:31:19 -08:00
Mark Salsbery
0d29c98df2 Enhanced Navigator Resizability (#280, #296)
New navigator options:

* @property {Boolean} [showNavigator=false]
*     Set to true to make the navigator minimap appear.
*
* @property {Boolean} [navigatorId=navigator-GENERATED DATE]
*     The ID of a div to hold the navigator minimap.
*     If an ID is specified, the navigatorPosition, navigatorSizeRatio,
navigatorMaintainSizeRatio, and navigatorTop|Left|Height|Width options
will be ignored.
*     If an ID is not specified, a div element will be generated and
placed on top of the main image.
*
* @property {String} [navigatorPosition='TOP_RIGHT']
*     Valid values are 'TOP_LEFT', 'TOP_RIGHT', 'BOTTOM_LEFT',
'BOTTOM_RIGHT', or 'ABSOLUTE'.<br>
*     If 'ABSOLUTE' is specified, then navigatorTop|Left|Height|Width
determines the size and position of the navigator minimap in the viewer,
and navigatorSizeRatio and navigatorMaintainSizeRatio are ignored.<br>
*     For 'TOP_LEFT', 'TOP_RIGHT', 'BOTTOM_LEFT', and 'BOTTOM_RIGHT',
the navigatorSizeRatio or navigatorHeight|Width values determine the
size of the navigator minimap.
*
* @property {Number} [navigatorSizeRatio=0.2]
*     Ratio of navigator size to viewer size. Ignored if
navigatorHeight|Width are specified.
*
* @property {Boolean} [navigatorMaintainSizeRatio=false]
*     If true, the navigator minimap is resized (using
navigatorSizeRatio) when the viewer size changes.
*
* @property {Number|String} [navigatorTop=null]
*     Specifies the location of the navigator minimap (see
navigatorPosition).
*
* @property {Number|String} [navigatorLeft=null]
*     Specifies the location of the navigator minimap (see
navigatorPosition).
*
* @property {Number|String} [navigatorHeight=null]
*     Specifies the size of the navigator minimap (see
navigatorPosition).
*     If specified, navigatorSizeRatio and navigatorMaintainSizeRatio
are ignored.
*
* @property {Number|String} [navigatorWidth=null]
*     Specifies the size of the navigator minimap (see
navigatorPosition).
*     If specified, navigatorSizeRatio and navigatorMaintainSizeRatio
are ignored.

Fixes #280 and #296
2013-12-13 09:23:56 -08:00
Sean Wilkinson
a5a72ee321 Set image.crossOrigin = 'Anonymous'; to avoid tainted canvas problem 2013-12-11 19:31:35 -06:00
Antoine Vandecreme
c90a1edfb5 Add layer-level-changed event and add $.indexOf polyfill 2013-12-10 19:22:15 -05:00
iangilman
06ef86dfe4 Merge pull request #304 from msalsbery/control-anchor
Added ControlAnchor options for default controls
2013-12-10 09:46:26 -08:00
Mark Salsbery
babfb99be9 Code fix 2013-12-09 10:04:39 -08:00
Antoine Vandecreme
0c2af6550a Add support to add/remove layers and change their levels. 2013-12-09 09:26:36 -05:00
Mark Salsbery
6b6b7f7625 Added ControlAnchor options for default controls 2013-12-06 22:48:49 -08:00
Mark Salsbery
374d0288dd Code cleanup
Removed commented and leftover code
2013-12-06 16:28:49 -08:00
Mark Salsbery
d3bcd0cec8 Better Button Fix
Wrapped the images in a single div and used that as the content of a
button element.
2013-12-06 16:24:52 -08:00
Mark Salsbery
e070475172 Button Tab Index Fix 2013-12-06 15:51:11 -08:00
Mark Salsbery
a6a21d21ae Button Image Alignment Fix (#272, #30)
Changed button element from button to div for consistent rendering
across browsers.
2013-12-06 11:22:51 -08:00
Ian Gilman
dfcb9f381e Added missing comma in code example 2013-12-04 10:22:18 -08:00
Mark Salsbery
8319737afd Documentation Update 2013-12-02 09:23:51 -08:00
Antoine Vandecreme
58da998d75 Add basic layers support 2013-11-30 17:28:17 -05:00
Mark Salsbery
7424bd328c Documentation Update 2013-11-29 12:10:15 -08:00
Mark Salsbery
bb836768f8 Merged upstream changes, fixed conflicts 2013-11-26 10:21:59 -08:00
iangilman
ff32549c99 Merge pull request #292 from msalsbery/versioning
Added an OpenSeadragon.version property
2013-11-26 09:45:28 -08:00
Mark Salsbery
d8006e96c9 autoSize doc fixups 2013-11-25 12:10:19 -08:00
Mark Salsbery
12596b2ee5 Add jshint ignore directives to version 2013-11-25 12:02:43 -08:00
Mark Salsbery
f34fe1b6e5 Added @since doclet tag to OpenSeadragon.version 2013-11-25 11:51:36 -08:00
Mark Salsbery
2684f0ab3a Added radix to parseInt()s 2013-11-25 10:44:34 -08:00
Mark Salsbery
7cb2f7cfd5 Updated Doclets
Botton fixes :)
2013-11-25 10:38:50 -08:00
Mark Salsbery
952fcca46e Renamed noResizePolling to autoResize 2013-11-25 10:27:03 -08:00
Mark Salsbery
f0d6a5872f OpenSeadragon.version property change
grunt property name changed to be more OpenSeadragon-specific
2013-11-25 09:30:49 -08:00
Mark Salsbery
2a1b797767 Modified OpenSeadragon.version property
Let grunt do more of the work!
2013-11-25 09:19:50 -08:00
Mark Salsbery
930e8c4dfd Updated Doclets 2013-11-25 08:48:44 -08:00
Mark Salsbery
cb765afea2 Added an OpenSeadragon.version property 2013-11-23 10:39:37 -08:00
Mark Salsbery
190b4425ed Renamed pollForResize to noResizePolling
Flipped truthiness...default of false is better for backward
compatibility
2013-11-23 08:21:08 -08:00
Mark Salsbery
c7971419e2 Added pollForResize option
Defaults to true.
2013-11-22 17:07:44 -08:00
Mark Salsbery
7f60184b9a Updated Doclets
Found another @fires
2013-11-21 19:43:45 -08:00
Mark Salsbery
ece76925a6 Updated Doclets
Lots of changes, most notably event documentation (@event and @fires)
2013-11-21 12:19:07 -08:00
Mark Salsbery
b38823e390 Merged upstream changes 2013-11-20 20:39:06 -08:00
Mark Salsbery
ebb15936e1 Removed the 'onPageChange' callback (#285)
Fix for #285
Removed the 'onPageChange' callback from the viewer options.
Viewer.goToPage() now raises the 'page' event only.
2013-11-19 12:13:38 -08:00
Mark Salsbery
9065b5e1db Merge remote-tracking branch 'origin/master' into jsdoc3-documentation 2013-11-19 11:24:54 -08:00
Mark Salsbery
f23395b60e Updated doclets
Misc changes.
Committing to merge upstream changes.
2013-11-19 11:20:45 -08:00
iangilman
40dd1d276b Merge pull request #286 from jpstroop/master
Support IIIF servers that don't report tile dimensions
2013-11-19 10:59:06 -08:00
Mark Salsbery
09de239bfa Updated doclets
Remaining creation options - still need descriptions on some.
Started event descriptions.
Viewer constructor parameters fixed.
2013-11-19 10:08:04 -08:00
Mark Salsbery
e30b0db3aa Merge remote-tracking branch 'origin/master' into jsdoc3-documentation 2013-11-18 11:11:24 -08:00
Mark Salsbery
3e1e5321c1 Updated doclets
openseadragon.js doc fixups
2013-11-18 10:30:48 -08:00
Mark Salsbery
b929f26872 Updated doclets
Creation options now documented in a typedef doclet named
OpenSeadragon.Options.
2013-11-18 10:06:38 -08:00
Jon Stroop
22587cec6e use the short dimension as the tile size if IIIF server does not report tile dimensions 2013-11-18 12:51:43 -05:00
Mark Salsbery
ccee9f5149 Updated doclets
Updated creation option defaults (issue #93)
2013-11-18 09:44:54 -08:00
Mark Salsbery
54049927f0 Updated doclets
Changed event docs:
Changed userData properties from optional to nullable.
Removed optional type from preventDefaultAction properties.
2013-11-18 06:56:32 -08:00