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

1027 Commits

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