Commit Graph

3526 Commits

Author SHA1 Message Date
Larissa Smith
f13691f60d Added option in addTiledImage to replace tiledImage at index. 2015-08-19 13:40:27 -06:00
Ian Gilman
5a2733bbc1 Merge pull request #702 from fs-webdev/master
Added small checks around code to make m2 sample work locally.
2015-08-13 10:49:18 -07:00
Grant Echols
9e142313d6 Added small checks around code to make m2 sample work locally. 2015-08-11 09:24:35 -06:00
Ian Gilman
1aacf69e76 Changelog for #696 2015-07-31 10:22:03 -07: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
Ian Gilman
81e24e6ba2 Changelog for #693 2015-07-30 10:05:49 -07:00
Ian Gilman
537eb83e34 Merge pull request #693 from O-Zone/master
Added XDomainRequest as fallback method for ajax, if XMLHttpRequest f…
2015-07-30 09:19:08 -07: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
Ian Gilman
1c17374de1 Tweaks for #673 2015-07-15 09:50:15 -07:00
Ian Gilman
c7b66b3e0a Merge pull request #673 from ConnerMan/master
Add support for non-square tiles (#670)
2015-07-15 09:43:29 -07:00
Conner Wingard
5633c3fe48 Fix typo in changelog.txt 2015-07-15 10:25:28 -04:00
Conner Wingard
b687332c9e Fix merge conflict in upstream changelog.txt 2015-07-14 16:46:47 -04:00
Conner Wingard
fc545ded41 Update changelog for non-square tiles #673 2015-07-14 16:17:11 -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
8508c2c450 Changelog for #680 2015-07-08 08:58:46 -07: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
Larissa Smith
57e6fdde90 Added tests for collectionColumns use by world.arrange. 2015-07-07 14:09:49 -06:00
Ian Gilman
c1d4652eee Changelog for #679 2015-07-07 09:52:03 -07:00
Ian Gilman
b56c99d367 Merge pull request #679 from fs-webdev/master
Added error message tracking into the tile loading mechanism. This ex…
2015-07-07 09:50:56 -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
Ian Gilman
5991b21cb9 Merge pull request #677 from openseadragon/ian
Added demo for TileSource swapping
2015-07-03 10:20:20 -07:00
Ian Gilman
e93a0862bd Added demo for TileSource swapping 2015-07-03 10:19:10 -07: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
c25f3e374b Newer versions of qunit and qunit-istanbul 2015-06-29 14:21:53 -07:00
Ian Gilman
b09897dbf1 Added changelog for #666 2015-06-29 14:16:11 -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
Ian Gilman
ad2940d897 Changelog for #668 2015-06-24 09:20:33 -07:00
Ian Gilman
5d61bcedd3 Merge pull request #668 from ricochet2200/hidden-overlay
Hidden overlay
2015-06-24 09:18:46 -07: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
Rick Smith
cdf1942202 Create demo for creating an overlay 2015-06-23 16:02:46 -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