Commit Graph

1745 Commits

Author SHA1 Message Date
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 © 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
Mark Salsbery
70b91d57ec Updated doclets for jsdoc3
Updated so jsdoc3 parser picks everything up.
Added event docs.
Lots of documentation content needed...
2013-11-15 22:19:53 -08:00
Mark Salsbery
3d2a9e4699 Removed Button href (#274) 2013-11-14 10:13:49 -08:00
Mark Salsbery
7b0ba31487 Cleaned up some messy javascript 2013-11-11 13:33:27 -08:00
Antoine Vandecreme
03f25cef5f Add support to cancel full screen and full page events.
Fix fullpage when element has margin or padding.
2013-11-08 15:03:54 -05:00
Antoine Vandecreme
6aca0c0886 Add counter to avoid trying to set scroll indefinitly
Style and spelling fixes
Set scrolls tests setup inside own function
2013-11-08 13:56:13 -05:00
Antoine Vandecreme
fafc985ada Merge branch 'master' of https://github.com/openseadragon/openseadragon into fullscreen 2013-11-08 13:40:04 -05:00
Ian Gilman
df80d2e572 Merge branch 'MouseTracker-preventDefaultAction' of github.com:msalsbery/openseadragon into msalsbery-MouseTracker-preventDefaultAction
fixed Conflicts:
	changelog.txt
2013-11-08 10:04:22 -08:00
Mark Salsbery
5c4131303a Use canvas when available - Fixes
Removed redundant useCanvas property from drawer
2013-11-07 11:48:01 -08:00
Mark Salsbery
8e325a3748 Added preventDefaultAction flag to MouseTracker
Added a boolean preventDefaultAction property (default false) to the
event object passed to MouseTracker handler methods. Implemented in the
following MouseTracker subscribers:

* Viewer.keyboardCommandArea.innerTracker.focusHandler:
preventDefaultAction == true prevents scrolling viewer into view
* Viewer.keyboardCommandArea.innerTracker.keyHandler:
preventDefaultAction == true prevents viewer keyboard navigation
* Viewer.innerTracker.clickHandler: preventDefaultAction == true
prevents viewer zoom on click
* Viewer.innerTracker.dragHandler: preventDefaultAction == true prevents
viewer panning with mouse/touch
* Viewer.innerTracker.scrollHandler: preventDefaultAction == true
prevents viewer zooming on mousewheel/pinch
2013-11-04 12:41:45 -08:00
Antoine Vandecreme
d70845d7eb Separate fullscreen and fullpage methods (#91)
Fix scroll issue.
Handle fullscreen denial by the browser
2013-11-02 21:01:04 -04:00
Antoine Vandecreme
d853224c15 Add units tests for scroll 2013-11-01 17:37:19 -04:00
Mark Salsbery
085c7f2ecb Use canvas when available - Fixes
Updated documentation doclet.
Enclosed detection code in a function.
Eliminated the Drawer USE_CANVAS global and replaced it with a
Drawer.useCanvas instance variable.
2013-11-01 13:02:28 -07:00
Mark Salsbery
85fcf0ec11 Merge remote-tracking branch 'origin/master' into canvas-detect
Conflicts:
	src/openseadragon.js
2013-11-01 12:22:48 -07:00
iangilman
047129e817 Merge pull request #262 from avandecreme/mousestop
Add mouse stop event
2013-11-01 11:14:57 -07:00
Mark Salsbery
e209846ac1 Use canvas whenever possible (#191)
Drawer uses an HTML5 canvas element if it's available.

Viewer.useCanvas can be used to override (default is true).
2013-11-01 10:19:47 -07:00
Antoine Vandecreme
7375ba9241 Fix scrolling when exiting full-screen mode.
Rename fullpage event to full-page and it's fullpage property to fullPage.
Add pre-full-page event.
2013-10-31 22:19:22 -04:00
Antoine Vandecreme
3f5db8f8de Fix mousestop event on IE 2013-10-31 16:16:08 -04:00
Mark Salsbery
bbedbd29cb Merged changes from master 2013-10-31 11:27:13 -07:00
Antoine Vandecreme
542d5f5aeb Remove cancelEvent + fix typos 2013-10-30 21:28:10 -04:00
Mark Salsbery
9e5dcd766f Punctuation fix 2013-10-30 13:35:39 -07:00
Mark Salsbery
cfd76a6fd9 Whitespace fix 2013-10-28 12:38:17 -07:00
Mark Salsbery
d6b187eb06 Fix for non-canvas tile rendering at large size
In USE_CANVAS==false mode, wrapped tile img elements in div elements to
allow them to be rendered larger than their containing element without
being stretched.
2013-10-28 12:36:29 -07:00
Mark Salsbery
0f8ac4cfab Added 'MozMousePixelScroll' event handling
For older Firefox versions
2013-10-24 13:39:00 -07:00
Mark Salsbery
755c4752c0 'wheel' Event Support Fixes
Whitespace, cancel handling
2013-10-23 13:55:52 -07:00
Mark Salsbery
e76c9e65ab Added 'wheel' Event Support
Also improved OpenSeadragon.addEvent()/OpenSeadragon.removeEvent()
2013-10-23 12:58:36 -07:00
Antoine Vandecreme
d4a4276bbc Fix margin bug with legacy fullscreen mode 2013-10-23 10:00:08 -04:00
Antoine Vandecreme
8debb26d61 Add mouse stop event 2013-10-22 16:54:04 -04:00
iangilman
c9f60fd468 Merge pull request #218 from gwills/master
IE 10 not reading DZI file correctly
2013-10-22 10:35:05 -07:00
iangilman
5d45054fee Merge pull request #257 from msalsbery/EventSource-Original-Events
originalEvent Pass through to EventSource events (#227)
2013-10-22 10:31:18 -07:00
gwills
3777b53507 Revert "Fix rotate on rectangular overalys"
This reverts commit a70d082be3.
2013-10-22 13:54:32 +01:00
Antoine Vandecreme
54d02ada78 Replace viewport.getImageZoomRatio by conversion methods between viewport zoom and image zoom 2013-10-18 15:16:49 -04:00
Mark Salsbery
984dd267b6 originalEvent Pass through to EventSource events 2013-10-15 11:11:08 -07:00
Antoine Vandecreme
f712e15793 Recenter the image after switching fullscreen mode. #62 and #170 2013-10-14 18:01:58 -04:00
gwills
a70d082be3 Fix rotate on rectangular overalys
Use size after rotate when positioning the overlay.

Also removed check on this.scales - was there a reason these were not
handled when rotating? If so we can add a option here maybe.
2013-10-14 10:59:20 +01:00
Antoine Vandecreme
4cd98a5da9 Check hash in viewer constructor.
Fix #229
Fix #176
2013-10-12 18:30:05 -04:00
iangilman
e006d0e05a Merge pull request #254 from msalsbery/Event-Handler-Signatures
Event Handler Signatures Changed to 'fn(event)' (#251)
2013-10-11 10:57:20 -07:00
Mark Salsbery
f9fb80b4d2 referencestrip.js spacing fix 2013-10-11 10:50:50 -07:00
Mark Salsbery
f5750bb9f6 referencestrip.js event handler cleanup 2013-10-11 10:44:03 -07:00
iangilman
e89562c03a Merge pull request #252 from Sharpbarb/master
Add the ability to create a viewer and start at a specified page
2013-10-11 09:57:28 -07:00
Mark Salsbery
d574700b3d Event Handler Signatures Changed to 'fn(event)'
All event handler signatures changed to 'fn(event)'
eventSource property added to the event object passed
Redundant event source properties removed ('button' and 'viewer'
Documentation updated in MouseTracker
changelog.txt updated
2013-10-10 17:00:15 -07:00
Sharpbarb
3078642927 Update viewer.js
Moved call to _updateSequenceButtons inside if ( initialTileSource )
2013-10-10 12:57:02 -07:00
Sharpbarb
4535f47e8d Update viewer.js
trailing whitespace...
2013-10-10 12:35:49 -07:00
Sharpbarb
6b90687ab4 Update viewer.js
description; Move _updateSequenceButtons behind goToPage()
2013-10-10 12:27:49 -07:00
Sharpbarb
a862870883 Update viewer.js
Formatting; descriptions; rename sequenceButtons to _updateSequenceButtons
2013-10-10 12:25:11 -07:00
Sharpbarb
7aac7ffd9c Update openseadragon.js
Align initialPage value
2013-10-10 12:05:05 -07:00
iangilman
9050a39387 Merge pull request #243 from avandecreme/master
Add coordinates conversion methods to viewport.
2013-10-10 10:38:09 -07:00
Sharpbarb
6f79f80fe0 Update viewer.js
trailing white space....
2013-10-09 15:36:21 -07:00
Sharpbarb
0f705d093a Update viewer.js 2013-10-09 15:31:33 -07:00
Sharpbarb
0d8d770327 Update viewer.js 2013-10-09 15:27:43 -07:00
Sharpbarb
81664251cc Update openseadragon.js
Missing colon
2013-10-09 15:22:36 -07:00
Sharpbarb
2f33e6c666 Update viewer.js 2013-10-08 21:45:26 -07:00
Sharpbarb
c6597806ba Update viewer.js 2013-10-08 17:10:26 -07:00
Sharpbarb
54bcd6ea79 Update viewer.js
Remove the sequence control update and put it into its own function. This way it can be called after a tilesource is loaded.
2013-10-08 17:07:49 -07:00
Sharpbarb
ec71a4416e Update viewer.js 2013-10-08 15:01:28 -07:00
Sharpbarb
fc972df52e Update openseadragon.js 2013-10-08 14:53:08 -07:00
iangilman
7d8fb803ef Merge pull request #244 from msalsbery/Pinch-Zoom-Fix
Pinch zoom fix
2013-10-08 10:23:10 -07:00
iangilman
45ee8236e3 Merge pull request #247 from jmnetus/master
Check that zoom reference point is valid before using it
2013-10-08 10:17:29 -07:00
Mark Salsbery
1c17ea8afa Merge branch 'master' into Pinch-Zoom-Fix
Conflicts:
	changelog.txt
2013-10-07 08:44:29 -07:00
Mark Salsbery
a9cf3f2904 Merge branch 'master' into Button-Event-Signatures 2013-10-07 08:38:08 -07:00
Jon Stroop
964e73b9a5 iiiftilesource now uses pixel-based syntax 'w,'. level 1 compliance it still required, so backward compatability should not be an issue 2013-10-05 15:02:26 -04:00
Antoine Vandecreme
3e5a9b52c9 Rollback basic.html and create coordinates.html.
Fix unit tests.
Fix documentation.
2013-10-05 10:21:12 -04:00
Jonathan Nielsen
c5ac5b6550 whitespace formatting change 2013-10-04 13:09:58 -06:00
Jonathan Nielsen
ae5acb6547 Add similar refPoint validity check to zoomBy 2013-10-04 13:06:25 -06:00
Jonathan Nielsen
fd85ee4f4e Check that zoom reference point is valid before using it 2013-10-04 10:12:47 -06:00
Mark Salsbery
dde06bf416 Merge branch 'master' into Button-Event-Signatures 2013-10-03 19:50:57 -07:00
Mark Salsbery
2f31395fc0 Merge remote-tracking branch 'origin/Touch-Bug-Fix' 2013-10-03 17:07:28 -07:00
iangilman
d88ce4a970 Merge pull request #242 from msalsbery/Touch-Bug-Fix
Fix for touch event issue #240
2013-10-03 16:30:15 -07:00
Mark Salsbery
d55b2e7703 Pinch zoom fix
The existing code failed on iPhone Safari iOS 6.x - event.detail was
always 0 causing only zoom out behavior.
2013-10-03 15:30:40 -07:00
Antoine Vandecreme
791ecfae75 Add coordinates conversion methods to viewport. 2013-10-03 17:27:11 -04:00
Mark Salsbery
9928a6d925 Fix for touch event issue #240 2013-10-03 12:11:33 -07:00
Mark Salsbery
76733c4ca2 Button event signatures fixed for consistency
Button event signatures now "handlerMethod(eventSource, eventData)"
where eventData == { button }
2013-10-03 09:29:20 -07:00
Mark Salsbery
5c37a1f375 Ready event signature fixed for consistency
Signature now handlerMethod(eventSource, eventData)
2013-10-02 13:09:40 -07:00
Mark Salsbery
d8fc7d10f9 Merge branch 'master' into Event-Names-Normalize 2013-10-01 15:12:00 -07:00
Jon Stroop
e4bd874b03 added test for 1.1; renamed 11 to 1_1 2013-10-01 15:07:44 -07:00
Jon Stroop
1a52656ed6 supports IIIF 1.1 syntax 2013-10-01 15:07:43 -07:00
Jon Stroop
890ec0c848 fixed size param 2013-10-01 15:07:42 -07:00
Jon Stroop
bccbf5ecf1 configureFromObject uses @id 2013-10-01 15:07:42 -07:00
Jon Stroop
e3c1007ae2 use pixels for size instead of pct 2013-10-01 15:07:41 -07:00
Jon Stroop
434807a660 added support for iiif 1.1 2013-10-01 15:07:41 -07:00
Mark Salsbery
ec3141a778 Event Names Normalized
Compound event names lower case with hyphen.
Button event names removed "on" and made lower case.
2013-09-30 10:22:06 -07:00
Mark Salsbery
c0a16dacc4 eventsource.js comment fix 2013-09-26 10:23:00 -07:00
Mark Salsbery
bf0608b4b2 string.js quotes/whitespace fix 2013-09-26 10:16:10 -07:00
Mark Salsbery
041597998f Event Names Normalized
All event names lower case with no hyphens
2013-09-26 09:50:26 -07:00
iangilman
21aa2dc928 Merge pull request #228 from msalsbery/EventHandler-Rename
Renamed EventHandler to EventSource (#225)
2013-09-25 09:04:04 -07:00
gwills
f8a0315757 Small formatting change
Needed to change spacing to pass through jshint
2013-09-24 21:54:54 +01:00
gwills
8f2999da29 Use $.parseXml for parsing string as XML 2013-09-24 21:49:54 +01:00
Mark Salsbery
dab182757d Renamed EventHandler to EventSource (#225) 2013-09-24 13:36:13 -07:00
Ian Gilman
6396fe1504 Merge branch 'Original-Events-In-Handlers' of github.com:msalsbery/openseadragon into msalsbery-Original-Events-In-Handlers
Fixed Conflicts:
	changelog.txt
2013-09-24 10:28:46 -07:00
Mark Salsbery
c27481546a MouseTracker Original Events in Handlers
Whitespace fixes on un-empty [] brackets
2013-09-20 09:58:18 -07:00
Mark Salsbery
56ef12e850 Original Events in Handlers
Documentation fixes
isTouchEvent property removed from eventData where not used
'eventOrTouchPoint' var name used and 'originalEvent' var name restored
to 'event'
2013-09-12 10:05:50 -07:00
Nelson Hart
6d6cc363b4 Use style attributes when storing the previous elment size instead of the literal size of the element #220 2013-09-12 10:41:51 -03:00
Mark Salsbery
af078f8f19 MouseTracker Original Events in Handlers
Renamed insideElementRelease to insideElementReleased.
2013-09-10 17:31:51 -07:00
Mark Salsbery
1dc2d7e011 MouseTracker Original Events in Handlers
Touch events bug fix. Now uses touch object(s) properly when calculating
positions.
2013-09-10 17:23:19 -07:00
Mark Salsbery
13415b36f3 MouseTracker Original Events in Handlers
Misc name changes, indentation/whitespace fixes.
Still TODO: Fix documentation, evaluate presence of key handler in a
mouse tracker, evaluate whether isTouchEvent flag should be in all
eventData objects or not.
2013-09-09 14:27:58 -07:00
gwills
2bef2e882f IE 10 not reading DZI file correctly
IE 10 is treating the data coming back from the JSONP request as a
string and not as XML. I have confirmed this issue is happening on
numerous IE10 machines but have not seen it on any other browser.

The change simply checks the type of the data variable and if it is a
string it parses the string as XML and updates the data object.
2013-09-07 17:08:39 +01:00
Mark Salsbery
d60224b615 MouseTracker Original Events in Handlers
Pass original touch events to handlers.
2013-09-06 13:12:11 -07:00
Mark Salsbery
2e1f71a824 MouseTracker Original Events in Handlers
Bug fixes.  Event handler methods shouldn't be called directly in
theory...
2013-09-06 12:24:19 -07:00
Mark Salsbery
8229a9aba5 MouseTracker Original Events in Handlers
More formatting fixes
2013-09-06 11:20:14 -07:00
Mark Salsbery
5f6b89b8b5 MouseTracker Original Events in Handlers
More formatting fixes
2013-09-06 11:10:05 -07:00
Mark Salsbery
56f5b9fb74 MouseTracker Original Events in handlers
Comment & Formatting fixes
2013-09-06 10:43:39 -07:00
Mark Salsbery
b3fa8f1184 MouseTracker original events in handlers
Implemented "Expose original event in handlers" (#23) for MouseTracker

Added OpenSeadragon.getElementOffset() method. Element-relative mouse
coordinates should be correct even if the element and/or page is
scrolled (#131)
2013-09-05 17:20:17 -07:00
Ian Gilman
75ddd299e4 Changed Seajax to OpenSeadragon 2013-09-05 16:26:00 -07:00
Antoine Vandecreme
63af5a69ac Add comments and fix indentation 2013-09-04 14:13:25 -04:00
Antoine Vandecreme
bfa76e471b Add viewportToImageRectangle method and add support to pass a point to viewportToImageCoordinates and imageToViewportCoordinates 2013-08-30 13:59:48 -04:00
iangilman
b2ecdcdc2a Merge pull request #208 from acdha/ie8-ajax-error-handler-fix
Fix AJAX error reporting on IE8
2013-08-30 09:52:11 -07:00
Chris Adams
baa3559df1 Graceful handling of cross-domain tilesource failures on IE<10
The TileSource error handling path used to raise non-obvious
"Unspecified error" exceptions on IE < 10 when configured with a URL
from a different origin (hostname or port) because the handler included
``xhr.status`` in the error message, triggering a security exception.

Now the second exception is caught and the log message will use the
original exception message instead to make the root cause more obvious.
2013-08-30 12:32:17 -04:00
Chris Adams
1b6cf93474 Graceful handling of IE cross-domain AJAX failures
Prior to IE 10, XmlHttpRequest cannot be used for requests to a
different origin even when the target URL's CORS headers would allow
access (see http://caniuse.com/#feat=cors).

This is easy to miss in testing if you use a single origin during
testing but have a CDN or domain-sharding for production and will break
the error handler function passed to makeAjaxRequest() if that code
assumes it can access properties on the request object.

This adds a more informative pointer to Microsoft's documentation when a
security exception is raised.
2013-08-29 16:13:18 -04:00
Mark Salsbery
c7f184f199 Reverted breaking change for issue #201
To be grouped with other breaking changes for major version release.
Also, minor formatting fix in src/eventhandler.js
2013-08-27 10:10:55 -07:00
Mark Salsbery
57ae0656c1 Fixes for issues #198, #201, #202, #203 2013-08-26 16:48:59 -07:00
Mark Salsbery
f8ab315795 Revert "Bad sync"
This reverts commit 70a7e8090e13cc35b93e652d2bcd7f418af26fc1.
2013-08-26 15:48:03 -07:00
Mark Salsbery
04a0197dc7 Fixes for issues #198, #201, #202, and #203 2013-08-26 15:25:57 -07:00
iangilman
aefe7f3610 Merge pull request #185 from robhobbes/master
Adding partial support for rotation.
2013-08-20 11:08:58 -07:00
Robert Hickman
d4467477ad More rotation documentation. 2013-08-19 16:29:22 -06:00
Ian Gilman
4b0450d271 Documented "current" param to a number of viewport functions 2013-08-19 10:14:04 -07:00
iangilman
d2353746c9 Merge pull request #179 from lukemurray/destroy
Add a destroy function on the viewer to clean up and remove elements
2013-08-19 10:03:12 -07:00
iangilman
dde052a22a Merge pull request #188 from iangilman/touch
Ignoring touchMove if we didn't get the touchStart
2013-08-19 09:57:36 -07:00
iangilman
e955c402ac Merge pull request #187 from iangilman/rtl
Drawer now works when the page is rtl
2013-08-19 09:55:04 -07:00
Robert Hickman
767c897e7f Revisions to rotate after second code review. 2013-08-16 11:32:21 -06:00
Ian Gilman
96c14f7617 Ignoring touchMove if we didn't get the touchStart 2013-08-16 10:09:49 -07:00
Robert Hickman
54e8d8c43f Fixes made after first code review of rotation. 2013-08-15 16:15:20 -06:00
Ian Gilman
6669589e5e Drawer now works when the page is rtl 2013-08-15 12:54:32 -07:00
Robert Hickman
6c63710131 Rotating overlays. 2013-08-14 13:43:49 -06:00
Ian Gilman
adbf35e002 Merge branch 'master' into form 2013-08-14 10:41:32 -07:00
Ian Gilman
3272572124 Clicking on a button control no longer refreshes page 2013-08-14 10:39:39 -07:00
Robert Hickman
b9583c43ac Working on rotating images.
So far only 90 degree rotation is supported.
Only the image is currently being rotated.
Overlays, debugger, and the navigator still need to be updated to support rotation.
2013-08-13 16:32:04 -06:00
Luke Murray
ab82783cf1 update the comments and unit test 2013-08-13 10:33:12 +10:00
Luke Murray
0c662b8a8d fix: comment updates and add a simple test for viewer.destroy 2013-08-12 16:38:37 +10:00
Luke Murray
68f9d675fc fix: calling viewer.destroy() multiple times throw an error. And a simple destroy to mousetracker 2013-08-08 17:49:24 +10:00
thatcher
88141c57f2 feature: navigatorPosition, option was available but not completely implemented 2013-08-08 00:12:44 -04:00
Luke Murray
4ccb141a42 Add a destroy function on the viewer to clean up and remove elements
created by open seadragon. Add removeAllHandlersForAllEvents to clean up all events on destroy. Clear
the onDraw callback on Overlay destroy.
2013-08-07 10:54:20 +10:00
Ian Gilman
967f2e4f32 Changelog for #177; minor doc tweaks 2013-08-02 09:40:55 -07:00
iangilman
51e37e3553 Merge pull request #177 from pnorcross/_getSafeElemSize
(hopefully) Final fix for issue #109, Viewport Broken on Hide.
2013-08-02 09:36:06 -07:00
pnorcrss
26938ed10e cleaned up docBlock and tabs in _getSafeElemWidth() 2013-08-01 12:11:33 -05:00
iangilman
f53ea2ddf1 Merge pull request #160 from lukemurray/custom_zoom_handler
Add the option for a zoom handler callback
2013-08-01 09:52:11 -07:00
Luke Murray
2717398181 Use the correct onDraw in drawer.js. Remove imageFullSize and fix up the comment for onDraw 2013-08-01 13:36:00 +10:00
pnorcrss
e47210d0bd refactored _getSafeElemSize() 2013-07-31 14:10:44 -05:00
pnorcrss
cb39fb7e32 fixed _getSafeElemSize() 2013-07-31 14:01:46 -05:00
pnorcrss
bf3dd7c031 fixed _getSafeElemSize() calls 2013-07-31 13:28:38 -05:00
pnorcrss
750eafcd2e added and implemented _getSafeElemSize() 2013-07-31 13:00:16 -05:00
iangilman
0aa0641cf4 Merge pull request #168 from ethanli83/fixtouch
canvas pans when tap on touch screen
2013-07-31 10:25:19 -07:00
Luke Murray
4239bb7adc fix: remove the useTransform/SVG stuff and move back to a simple onDraw callback only so people can handle their own custom drawing and sizing 2013-07-31 17:01:48 +10:00
Luke Murray
0a8d11875e Merge branch 'master' into custom_zoom_handler 2013-07-31 16:39:54 +10:00
ethan.li
0bb9c5be97 issue:
canvas pans when tap on touch screen

reason:
    onTouchStart calls onMouseDown which registers 'mousemove' event handler.
    when I tap on touch screen, even though browser did not dispatch 'touchmove' event, it dispatched 'mousemove' event.
    therefore, the 'mousemove' handler pans canvas.

fix:
    stop onTouchStart handler registering 'mousemove' handler as onMouseMove will be properly triggered by onTouchMove
2013-07-23 16:40:04 +10:00
Luke Murray
df877493a9 Rename drawHandler to onDraw. Also make it a notification style callback
(does not override the draw functionality).
Add an overlay option 'useTransform' that will transform the overlay
element instead of moving it's postion - useful for SVG elements
2013-07-16 12:04:37 +10:00
iangilman
77cf2a3b88 Merge pull request #159 from ethanli83/master
Fix for onTouchEnd
2013-07-12 09:01:31 -07:00
Luke Murray
233c3a357a Add the option for a zoom handler callback 2013-07-12 16:51:56 +10:00
ethan.li
0ef98be0b7 for fix I made to onTouchEnd:
1. remove IE8 related code as it does not support touch anyway
2. use event.changedTouches [ 0 ] rather than event
2013-07-12 10:29:44 +10:00
Ian Gilman
7391561dcd OpenSeadragon.now() returned undefined the first time; fixed 2013-07-10 09:31:22 -07:00
ethan.li
8108009ba7 fix issue:
onTouchEnd did not call the correct mouse up handler
2013-07-09 11:07:18 +10:00
iangilman
850aa14802 Merge pull request #151 from acdha/overhauled-ajax-error-reporting
Overhauled AJAX error reporting
2013-07-03 09:56:07 -07:00
radix-pro
004f13365d Update iiiftilesource.js 2013-07-02 13:41:37 -07:00
radix-pro
3c7e4b794a Update iiiftilesource.js 2013-07-02 00:41:22 -07:00
radix-pro
8f8e028015 Update iiiftilesource.js 2013-07-02 00:34:23 -07:00
radix-pro
acd55c709d Update iiiftilesource.js 2013-07-02 00:27:53 -07:00
radix-pro
040ff3a7ae Update iiiftilesource.js 2013-07-02 00:18:37 -07:00
radix-pro
a4303fb232 Update iiiftilesource.js 2013-07-02 00:02:48 -07:00
radix-pro
0441cfe4ec Update iiiftilesource.js 2013-07-01 23:55:07 -07:00
radix-pro
44a9d1b98b Update iiiftilesource.js 2013-07-01 23:49:25 -07:00
radix-pro
dde42b641d Update iiiftilesource.js
Fix Issue #55 "Tiles rendering issue..."
2013-07-01 22:38:37 -07:00
Chris Adams
0ed4703bd3 Viewport messages: add a class to the dialog for easy styling 2013-07-01 18:26:44 -04:00
Chris Adams
1ab6094420 Viewer: make viewport messages private, repeatable
* Marked _showMessage/_hideMessage as private
* Fix DOM manipulation bug: call standard removeNode() method rather
  than proprietary WebKit .remove()
* Change messageDiv to be the outer wrapper to simplify removing the
  entire message container
2013-07-01 13:43:48 -04:00
Chris Adams
b912896158 Viewer.showMessage() hides any previous message 2013-07-01 12:58:22 -04:00
Chris Adams
9de45ba281 Refactor OpenSeadragon.makeCenteredNode
* Use CSS display tables for vertical centering (tested back to IE8)
* Use the DOM instead of string concatenation
* Remove redundant styles ($.makeNeutralElement sets the same values
  for margin, padding & border)
* Return the outer wrapper element to ease DOM addition & removal
2013-06-28 15:52:48 -04:00
Chris Adams
1f345e4cc5 Viewer: refactor message code into showMessage/hideMessage methods
This avoids the need to deal with classes, and explicitly makes it
reusable for other needs
2013-06-28 15:46:31 -04:00
Chris Adams
7f42dfc032 code style 2013-06-28 15:01:56 -04:00
Chris Adams
fb7c91acd2 code style 2013-06-28 14:54:44 -04:00
Chris Adams
7dcf662fdd Viewer: add a basic error message display system
This might be something we want to make configurable for users who want
to completely control how errors are displayed.

This also adds the first use of OpenSeadragon.makeCenteredNode currently
so we might want to clean up that code as well.
2013-06-28 14:32:57 -04:00
Chris Adams
2bf6b13bfe User-visible warning when tile sources fail to load
This is currently using window.alert in lieu of something more sophisticated but it works for indicating 404s or invalid file
contents
2013-06-28 14:11:20 -04:00
Chris Adams
494bf7fe41 strings: add logging for untranslated source messages
This should probably be changed to be closer to the goal of being
like gettext but we can at least tell developers when we clobber the
string
2013-06-28 14:11:19 -04:00
Chris Adams
464428cef7 makeAjaxRequest: don't set request to null
Setting onreadystatechange can avoid the possibility of it somehow being
called twice but there's no point in nulling the request right before we
let the GC collect it.
2013-06-28 14:00:02 -04:00
Chris Adams
db38b71dd9 makeAjaxRequest: throw error for missing callback 2013-06-27 16:03:43 -04:00
Chris Adams
1c6a57c710 makeAjaxRequest: log all errors, test callback
* All AJAX errors will log to the console
* The onError callback will only be called if defined
2013-06-27 16:03:41 -04:00
Chris Adams
5eccdfee98 Better match project style 2013-06-27 15:58:09 -04:00
Chris Adams
496b7d757b Simplify OpenSeadragon.makeAjaxRequest
* Since async is always true – and browsers are starting to deprecate
  synchronous XHR – we were able to prune considerable amount of code
* Add an error callback to match the existing success callback
2013-06-27 15:58:09 -04:00
iangilman
8fe0ce26b8 Merge pull request #136 from acdha/jshint-cleanup
JSHint tidying
2013-06-26 09:37:08 -07:00
iangilman
f4139cef38 Merge pull request #144 from acdha/143-xhr-error-handling
Safe cleanup in makeAjaxRequest error handler
2013-06-26 09:23:04 -07:00
Ian Gilman
3f1072b321 Fixed typos in comments 2013-06-26 09:15:37 -07:00
Chris Adams
c648c1df8a drawer: don't leak drawLevel into global namespace
This code is still under-tested and documented but no longer relies on
`drawLevel` being leaked into the global namespace where `updateLevel`
to find it.

See #145
2013-06-25 14:26:09 -04:00
Chris Adams
f2cba16a8b Safe cleanup in makeAjaxRequest error handler
Previously `request.onreadystatechange` was assigned an empty function
on success but null on failures, which breaks in IE (see
http://jsbin.com/ezozax/6/).

This patch simply mimics the success behaviour in the cleanup function

Closes #143
2013-06-25 14:13:45 -04:00
Benjamin 'blindCoder' Schieder
0150622e78 fix error when recalculating overlay width and height 2013-06-25 18:01:38 +02:00
Chris Adams
c2107fcb22 Declare _processDZIError directly on OpenSeadragon 2013-06-21 16:37:31 -04:00
Kevin Ewing
8896c2278d Fixed mistake 2013-06-20 13:31:04 -07:00
Kevin Ewing
2ba3acda38 Removed extra parens 2013-06-20 13:23:16 -07:00
Kevin Ewing
248852c15f Implementing OpenSeadragon.now()
Replacing both `+new Date()` and `new Date().getTime()` with `$.now()`
2013-06-20 13:15:04 -07:00
Chris Adams
9ef6e085c8 viewer.js: update onfullscreenchange handler comment 2013-06-20 15:17:48 -04:00
Chris Adams
de29a34890 viewer.js: remove dead code 2013-06-20 15:12:55 -04:00
Chris Adams
adc4147304 Expose semi-private processDZIError for use by DziTileSource
This previously wasn't in scope outside of the main OpenSeadragon
closure. Now it's exposed with an underscore prefix to encourage people
not to think of it as a public interface.
2013-06-20 15:12:54 -04:00
Chris Adams
51bb8ca46e openseadragon.js: fix imageFormatSupported refs 2013-06-20 15:12:54 -04:00
Chris Adams
169244ed1a navigator.js: omit unused borderWidth from func args 2013-06-20 15:12:54 -04:00
Chris Adams
0d09183159 referencestrip.js: move variable declaration to the top of loadPanels 2013-06-20 15:12:54 -04:00
Chris Adams
eafc822aa8 openseadragon.js: remove unused builtin aliases 2013-06-20 15:12:54 -04:00
Chris Adams
8c433ba81c Declare assumed globals 2013-06-20 15:12:54 -04:00
Chris Adams
e2bea810e3 Replace gnarly ternary expression with if statement 2013-06-20 15:12:53 -04:00
Chris Adams
64d94ac2bd referencestrip.js: declare undeclared variable 2013-06-20 15:12:53 -04:00
Chris Adams
f8c77f65d7 viewer.js: fix typos in variable declarations 2013-06-20 15:12:53 -04:00
Chris Adams
d644acd50b Fix lack of braces on if statements
JavaScript's most popular rack in the grass for maintenance coders…
2013-06-20 15:12:53 -04:00
Chris Adams
643ee211ca Remove unused variables
Mostly unused function arguments but there were also a fair number
of legacy names which are now no longer used.

One question which comes up – mostly in tilesource.js – is whether
there is any value in leaving unused variables for functions which
are intended to be overridden anyway. I'm inclined to say that the
docs + tests need to be sufficient as there's no enforcement that
whatever is in the base implementation will actually be followed by
any of the real functions.
2013-06-20 15:12:53 -04:00
iangilman
6e9a300d1a Merge pull request #133 from iangilman/raf
Improved requestAnimationFrame polyfill; fixed timer leaks; added tests
2013-06-20 09:52:10 -07:00
Kevin Ewing
0984106983 Added missing semicolon 2013-06-20 09:08:21 -07:00
Kevin Ewing
2f8a26fda0 Responding to feedback
Function now re-assigns itself on the first go round to avoid doing the
check every time it is called
2013-06-19 15:13:56 -07:00
Ian Gilman
e0282a3c86 Stripped whitespace 2013-06-19 13:33:01 -07:00
Kevin Ewing
ebffea5a34 Merge branch 'master' into now 2013-06-19 11:23:42 -07:00
Ian Gilman
8e88f36098 Merge branch 'master' into raf
Fixed Conflicts:
	src/viewer.js
2013-06-19 11:19:54 -07:00
Kevin Ewing
e8408c1313 Moved to better location 2013-06-19 11:16:45 -07:00
Kevin Ewing
6a3b7cfb2f Added OpenSeadragon.now() 2013-06-19 10:57:09 -07:00
Chris Adams
9f6f164d9f Remove all whitespace
The results of running this command::

    find . -name \*.js -print0 | xargs -0 perl -p -i -e "s|[ \t]+$||"

(Split from #136)
2013-06-19 13:33:27 -04:00
Ian Gilman
beadcdcc89 Merge branch 'master' into raf 2013-06-19 10:15:53 -07:00
iangilman
c14467afa4 Merge pull request #135 from robhobbes/master
Only disable the previous button if the navPrevNextWrap option is not set
2013-06-19 10:12:38 -07:00
Ian Gilman
4022206261 Removed the parens around new Date call, for consistency 2013-06-19 10:03:44 -07:00
Ian Gilman
2e48239056 Addressing code review comments 2013-06-19 09:58:22 -07:00
Ian Gilman
dbc8a59ae8 Cleaned out dead code in scheduleUpdate and updateMulti
… as pointed out by @ventero
2013-06-19 09:58:09 -07:00
Robert Hickman
ade93ffc5e Only disable the previous button if the navPrevNextWrap option is not set. 2013-06-18 15:19:09 -06:00
Ian Gilman
713fad4224 Exposing _updateRequestId as a semi-private member for testing purposes 2013-06-18 11:06:43 -07:00
Ian Gilman
e99c126a85 Navigator now updates properly when reopening a viewer
Before, if you closed a viewer and then opened a new tilesource into
it, the navigator would still have the old tilesource. This patch fixes
that.
2013-06-17 11:51:02 -07:00
Ian Gilman
c6a38dd802 Now closing the navigator when the viewer closes
At the very least this was causing the navigator to continue to request
and process frames even after its viewer had been closed.
2013-06-17 11:31:41 -07:00
Ian Gilman
4224960252 Fixed another potential timer leak when closing a viewer
If the viewer was closed in response to an event raised during the
update function, the timer would have continued running.
2013-06-17 11:30:31 -07:00
Ian Gilman
0112f6a4ea Improved requestAnimationFrame polyfill
Processes all outstanding frame requests per frame, rather than one at
a time.
2013-06-17 11:28:42 -07:00
Ventero
0093153e4e Simplify setting element opacity.
This simplifies setElementOpacity by removing support for the
obsolete, IE-only element.filters property. Also removes a variable
that previously leaked into the global scope.
2013-06-13 19:09:47 +02:00
Ian Gilman
300167bcf1 Merge branch 'master' into ratio 2013-06-13 09:41:01 -07:00
iangilman
f412d07237 Merge pull request #121 from houseofyin/issue37-navigator
Issue37 navigator / Issue101 navigator follow-up / Issue102 navigator default
2013-06-13 09:39:27 -07:00
houseofyin
e9587808ec Tweaked how the deprecated API element has handled 2013-06-11 14:35:45 -04:00
houseofyin
8a3ec97596 Implemented and documented fallback behavior 2013-06-07 10:24:12 -04:00
Ventero
a18f0e0efb Improve performance of Tile#drawHTML.
By specifying the tile size in absolute pixel values instead of
percentages, we can save the call to $.getElementSize.
2013-06-03 20:09:42 +02:00
houseofyin
7a8ebd7d4c More reasonable handling of the navigator when interacting outside the bounds of the display region 2013-06-02 22:32:29 -04:00
houseofyin
dc7bc6920c Updating the documentation 2013-06-01 16:09:04 -04:00
houseofyin
3e24be12e0 Merge branch 'master' of github.com:openseadragon/openseadragon into issue37-navigator 2013-06-01 14:12:04 -04:00
houseofyin
e36f7ed414 Trying to remove the selector element 2013-06-01 14:11:56 -04:00
Ian Gilman
83060156a6 Merge branch 'master' into ratio 2013-05-31 09:18:25 -07:00
Ian Gilman
9c60b28ec3 Merge branch 'master' of github.com:robhobbes/openseadragon into robhobbes-master
Fixed Conflicts:
	changelog.txt
2013-05-31 09:01:14 -07:00
Robert Hickman
699a5dd101 Adding documentation about navPrevNextWrap. 2013-05-30 12:46:54 -06:00
Ian Gilman
b34f460fb0 Reverting minPixelRatio to 0.5 for better quality 2013-05-30 10:07:34 -07:00
iangilman
b754ea834f Merge pull request #112 from openseadragon/blur
Fixed blendTile()-related blurriness issue (for #95)
2013-05-30 09:24:30 -07:00
Ventero
b66dd7bed0 Don't load the tile source again when creating a navigator.
Previously, when showNavigator was set to true when creating the
viewer, the navigator would unnecessarily load and parse the tile
source, even though a fully parsed object already exists.
2013-05-30 02:53:53 +02:00
Robert Hickman
b5d977d593 Adding an option that allows the previous and next buttons to wrap around past the end or beginning images. 2013-05-29 17:10:45 -06:00
Ian Gilman
1d51b72785 Fixed blendTile()-related blurriness issue
We were setting drawer.updateAgain to the result of each blendTile(),
which meant it was keeping only the last result. Instead we should have
been only setting it to true if blendTile returned true, but never
setting it to false. Fixed.
2013-05-29 11:18:25 -07:00
David Steinbrunner
91da6af392 domn to down typo fixes 2013-05-28 17:34:20 -04:00
Ian Gilman
b7eb78a57a Additional doc comments for setControlsEnabled() 2013-05-28 13:54:13 -07:00
David Steinbrunner
7330b4a726 Correction to setControlsEnabled function name in comments 2013-05-28 17:36:09 -03:00
houseofyin
6385b0a296 Merge branch 'master' of github.com:openseadragon/openseadragon into issue37-navigator 2013-05-26 21:17:01 -04:00
houseofyin
f632d98730 Working on follow-up on the initial pull request. Changing the default navigator display property, and starting work on the docs 2013-05-26 21:16:56 -04:00
Ian Gilman
8e37633c49 Whitespace nits 2013-05-24 09:17:26 -07:00
Ian Gilman
8f53c564da Our requestAnimationFrame no longer changes the global window object 2013-05-23 09:48:38 -07:00
Chris Adams
568d6a1c6b Paranoid requestAnimationFrame for antique Firefox
Very old versions of Firefox - e.g. Firefox 7 - have
window.requestAnimationFrame but not cancelAnimationFrame. This is a
very old release so the easiest fix is simply to check for both of the
functions which we intend to call and fall back on traditional behaviour
if both aren't present.
2013-05-23 10:17:41 -04:00
Ian Gilman
c3772df011 Now trying standard path first in createAjaxRequest
As suggested by @cskwg in #98
2013-05-21 10:39:10 -07:00
Ian Gilman
674c0a069d Fixed typos in comments 2013-05-20 09:40:17 -07:00
iangilman
da86ca2e38 Merge pull request #46 from houseofyin/issue37-navigator
Issue37 navigator
2013-05-20 09:38:49 -07:00
houseofyin
bb4a8a0b4f Bringing back in sync with the latest baseline 2013-05-17 22:29:08 -04:00
Benjamin Gilbert
fa1a8b2dde Fix Drawer event emission
Drawer tries to emit events on the parent Viewer object but doesn't have
a reference to it.  Add a reference when constructing the Drawer.
2013-05-16 02:49:29 -04:00
Ian Gilman
c78f3ef743 Fixed mislabeled JSDoc comment for OpenSeadragon.Viewer.prototype.open 2013-05-14 10:29:15 -07:00
Ian Gilman
2566b2f5cf Separated file JSDoc comment from root object JSDoc comment; fixes doc building 2013-05-14 10:28:44 -07:00
iangilman
0b366d7b42 Merge pull request #89 from bgilbert/license
Revert to original New BSD license; clean up license declarations
2013-05-14 09:15:00 -07:00
Benjamin Gilbert
665ecd6655 Document New BSD license on @jpstroop's IIIF code 2013-05-14 00:20:35 -04:00
Benjamin Gilbert
fcc119bb84 Add file-specific descriptions to file headers 2013-05-14 00:00:24 -04:00
Benjamin Gilbert
7939fa7c4d Replace GitHub issue numbers with full URLs 2013-05-13 23:39:27 -04:00
Benjamin Gilbert
17a6ee15b1 Include 2010 in "OpenSeadragon contributors" copyright dates
This Git repository starts in 2011, but the CodePlex Mercurial repository
has commits from 2010.
2013-05-13 23:32:09 -04:00
Benjamin Gilbert
99d6ff80b6 Add fullpage class to viewer element when in fullpage mode
Closes #61.
2013-05-12 23:02:18 -04:00
Benjamin Gilbert
522bcbf058 Add addClass()/removeClass() utility functions 2013-05-12 22:53:41 -04:00
Benjamin Gilbert
56f5000d90 Document MIT license on John Dyer's fullscreen code
See #81.
2013-05-12 21:33:55 -04:00
Benjamin Gilbert
d80d928d80 Document New BSD license on seajax-utils OSM/TMS code
@rsimon has given permission in #58 for the OSM/TMS code that originated
in seajax-utils to be released under the New BSD license.
2013-05-12 18:07:20 -04:00
Benjamin Gilbert
2f2eba8df2 Add "OpenSeadragon contributors" copyright statement
The license text will be provided on the website, etc., and it seems
strange to list no copyright date newer than the original CodePlex
copyright from the AJAX Control Toolkit.  Add a blanket copyright
statement for contributions to the OpenSeadragon project, stating that
copyright is held by the authors of each contribution.  This blanket
statement is not intended to preclude individual contributors from
attaching their own copyright statements to their modifications.
2013-05-12 17:12:26 -04:00
Ian Gilman
199c2f6c2d Merge branch 'master' of github.com:openseadragon/openseadragon
Fixed Conflicts:
	test/test.html
2013-05-10 11:59:09 -07:00
Ian Gilman
c6f8b5e192 Fixed broken viewer.raiseEvent calls in drawer.js 2013-05-10 11:32:22 -07:00
Heath Nielson
eb14eae428 Merge remote branch 'upstream/master' into getString-error
Conflicts:
	test/test.html
2013-05-10 11:54:45 -06:00
Benjamin Gilbert
52badbef36 Add MIT license blocks to src/openseadragon.js
for code taken from jQuery and from mattsnider.com.

Ideally we'd keep the MIT-licensed helper code in a separate file,
but it proved difficult to extricate from the rest of openseadragon.js.

Also remove comment about plagiarism.  It's not plagiarism if it's
attributed and properly licensed.
2013-05-10 00:57:49 -04:00
Benjamin Gilbert
a7c96c56ef Drop MIT license; move BSD license to root directory
All OpenSeadragon contributors have granted their permission for this
relicensing in #58.

Drop copyright statements for Ian Gilman and Christopher Thatcher as
they requested in #10.

Revert CodePlex Foundation copyright date to 2009 pursuant to discussion
in #10.
2013-05-10 00:16:55 -04:00
Benjamin Gilbert
be20645876 Add BSD license block and CodePlex copyright to each source file
See discussion in #10.
2013-05-10 00:16:55 -04:00
Ian Gilman
8ded889af4 DZI JSONp was broken; fixed
Also added support for DZI files with .xml extension
2013-05-09 11:02:25 -07:00
Ian Gilman
bd0b0972b3 Fixed bad class names in docs 2013-05-02 09:57:23 -07:00
Ian Gilman
1c6deafe8b Added viewport property to Viewer documentation 2013-05-02 09:57:03 -07:00
Benjamin Gilbert
3652c7066c Re-add viewer.source check in updateMulti()
It should be redundant in normal operation, but may prevent a timer leak
in case of a bug in the open/close path.
2013-04-29 13:17:37 -04:00
Benjamin Gilbert
8cb2714dae Fix timer leak after multiple Viewer.open() calls, take 2
Track the request ID of the outstanding animation frame and cancel it
on Viewer.close().

Fixes #76.
2013-04-26 22:32:51 -04:00
Benjamin Gilbert
23c20e3d5a Revert "Fix timer leak after multiple Viewer.open() calls"
This should be done with cancelAnimationFrame() instead.

This reverts commit 47aba60940.
2013-04-26 21:48:48 -04:00
Heath Nielson
d16eb04a8a Fix setStrings() with the same fix as getStrings(). Initialize container to
I18N.
2013-04-26 15:18:27 -06:00
Benjamin Gilbert
47aba60940 Fix timer leak after multiple Viewer.open() calls
Keep a counter of Viewer.close() calls in private state and a copy in
the timer's closure, and stop the timer when they no longer match.

Fixes #76.
2013-04-25 00:37:36 -04:00
Benjamin Gilbert
9eb19d6c9c Garbage-collect strings 2013-04-25 00:23:02 -04:00
Benjamin Gilbert
b315b148c2 Drop remains of code to show "Loading..." message
It calls a method that no longer exists, but only when an impossible
condition is true.
2013-04-24 23:57:35 -04:00
Benjamin Gilbert
f958e66f05 Fix typo in preserveViewport handling 2013-04-23 23:58:58 -04:00
houseofyin
bbf0fc4302 Updated to address feedbac from @iangilman 2013-04-04 22:30:59 -04:00
Heath Nielson
530e445756 Fix a problem with getString when the string property is a sub-property. 2013-04-03 12:33:47 -06:00
houseofyin
ccf8934d0d Backout unneeded change in mousetracker.js 2013-04-03 13:42:16 -04:00
houseofyin
4c126dd39a Trying again to backout button.js changes 2013-04-03 13:36:55 -04:00
houseofyin
b352fe711b Trying again to backout button.js changes 2013-04-03 13:33:39 -04:00
houseofyin
df3344f67c Getting into alignment with code style guidelines 2013-04-03 11:51:24 -04:00
houseofyin
b3d358fa35 First pass at bringing the code in compliance with the project code standards 2013-04-02 21:07:10 -04:00
houseofyin
569a816df4 Backing out an event handler change 2013-04-02 21:06:07 -04:00
houseofyin
cfd5e67462 Backing out an event handler change 2013-04-02 18:40:28 -04:00
houseofyin
5bf4b51925 Checkpoint. Anchoring click to middle of view. Adding call to apply to constraints on viewer after the click, and additional testing 2013-04-01 22:33:58 -04:00
Chris Adams
2345f9b217 DziTileSource: avoid changing relative paths
For cases where DZI files aren't explicitly configured with a tilesUrl,
the logic for generating a URL from the DZI source URL would inject an
extra leading `/` which would either cause an unnecessary redirect or
break depending on whether the webserver in use attempts to normalize
`//` to `/`.

This change also removes some URL processing logic which duplicates the
browser's default behaviour
2013-03-26 16:11:27 -04:00
thatcher
9aecfddcbf refs #54 - added missing support for tilesource configuration as xml string or json string via Viewer.open 2013-03-26 14:35:43 -04:00
thatcher
86f101f02c refs #54 - pointing deprecated method at correct current method. 2013-03-26 09:25:56 -04:00
thatcher
266f33094c addresses #54, dont use openDZI, use open. openDZI now calls open. all the details of tileHost were already handled in DZITileSource.configure. $.createFromDZI is fully deprecated and will throw an error. 2013-03-26 09:02:34 -04:00
houseofyin
8db1a15282 A little cleanup of the border issue 2013-03-23 23:06:34 -04:00
houseofyin
450760d3b7 Merge branch 'master' of github.com:openseadragon/openseadragon into issue37-navigator
Conflicts:
	test/test.html
2013-03-23 21:44:22 -04:00
houseofyin
a7cec524eb Tweaked the border handling a bit 2013-03-23 21:11:30 -04:00
houseofyin
325bae2b6f Checking in a fix for issue 48 2013-03-21 13:54:39 -04:00
houseofyin
7187bca4e7 Merge branch 'master' of github.com:openseadragon/openseadragon into issue37-navigator 2013-03-18 14:38:10 -04:00
houseofyin
80ff8f908a Another checkpoint, added keyboard navigation to the main viewer 2013-03-16 16:35:33 -04:00
houseofyin
3e2b337a52 Another checkpoint 2013-03-15 22:29:27 -04:00
houseofyin
3b2bde2940 Initial pass at making the navigator float 2013-03-15 10:59:47 -04:00
thatcher
0297a20aee merged conflict 2013-03-14 09:08:27 -04:00