mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-25 14:46:10 +03:00
Code Issues Projects Releases Wiki Activity
1,565 Commits 12 Branches 28 Tags 35 MiB
d14ba88b70
Commit Graph

913 Commits

Author SHA1 Message Date
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