mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-29 08:36:10 +03:00
Code Issues Projects Releases Wiki Activity
2,287 Commits 12 Branches 28 Tags 35 MiB
2419a0111a
Commit Graph

1340 Commits

Author SHA1 Message Date
Petar Petrov
8bee1e7b8b doc tweak for edge smoothing changes - #755 2015-11-06 08:55:30 +02:00
Antoine Vandecreme
760aaa7dca Fix tests. 2015-11-05 22:32:56 -05:00
Antoine Vandecreme
f58a525f47 Discard the image as soon as possible. 2015-11-05 22:16:20 -05:00
Antoine Vandecreme
b85d0674e6 Add support to open an ImageTileSource with it constructor. 2015-11-05 22:04:21 -05:00
Petar Petrov
7eda39c9a9 fixed edge smoothing to work with clipping and placeholderFillRect - #755 2015-11-05 16:31:13 +02:00
Petar Petrov
515c15bf98 various fixes for edge smoothing - #755 2015-11-05 16:19:56 +02:00
Antoine Vandecreme
67b0d9bd99 Fix options handling and improve doc. 2015-11-04 18:47:41 -05:00
Ian Gilman
db5949c2d7 Merge pull request #754 from fs-webdev/master 
Added a patch to help slow down the scroll devices that fire too fast…
 2015-11-04 11:31:01 -08:00
Petar Petrov
8c4fcc9ca9 tile edge smoothing at high zoom - #755 2015-11-04 17:04:50 +02:00
Sebastian Öberg
6b098c1c2b Fixed zooming in with plus sign. 2015-11-04 11:00:08 +01:00
Antoine Vandecreme
0c75b45075 Save the context of the full image as well. 2015-11-02 19:57:13 -05:00
Antoine Vandecreme
37ca9235f8 Avoid using data urls in ImageTileSource. 2015-11-02 19:42:14 -05:00
Antoine Vandecreme
14a83e1154 Add IE8 support in ImageTileSource. 2015-11-02 18:35:11 -05:00
Grant Echols
3214494dc9 Added code to swallow the canvas-scroll event if we are swallowing it because of time. 2015-11-02 16:03:27 -07:00
Antoine Vandecreme
8e06eb56cf Add pyramid building to the ImageTileSource. 2015-11-01 15:55:39 -05:00
Antoine Vandecreme
3316a55b97 Add CORS support to ImageTileSource 2015-11-01 13:25:25 -05:00
Antoine Vandecreme
c041746366 Add ImageTileSource. Fix #467 2015-11-01 10:23:02 -05:00
Ian Gilman
88709189df Merge branch 'master' into ian3 
Fixed Conflicts:
	changelog.txt
 2015-10-29 14:31:38 -07:00
Ian Gilman
6b208f8a75 * You can now change viewport margins after the viewer is created (#721) 2015-10-29 14:29:59 -07:00
Ian Gilman
671379e1c3 * Fixed an issue with TiledImage setPosition/setWidth/setHeight not reliably triggering a redraw (#720) 2015-10-29 13:42:45 -07:00
Grant Echols
40edbd7a1c Updates as per code review requests 2015-10-28 17:07:51 -06:00
Grant Echols
ad4bbb9daf Changed name of config parameter to include 'MS' to suggest milliseconds. 2015-10-27 15:33:39 -06:00
Grant Echols
19c6179533 Added a patch to help slow down the scroll devices that fire too fast. This new code reduces the number of 'canvas-scroll' events that fire and slows down the zoom process. 2015-10-27 14:00:45 -06:00
Ian Gilman
8eb4cd9453 Merge pull request #744 from javierquevedo/master 
Fixed issue in iOS devices that would cause all touch events to fail …
 2015-10-27 09:00:43 -07:00
Sebastian Gassner
85edea7250 Add overlays after loading tileSource, when using per-tileSource overlays. 2015-10-17 09:48:09 +02:00
Javier Quevedo
f20d2ffa4d Fixed issue in iOS devices that would cause all touch events to fail after a Multitasking Gesture was triggered. The fix works by aborting all touch contacts after a touch has been cancelled, since the Multitasking Gestures in iOS trigger the TouchCancel event on those touches which were active.. 2015-10-16 15:52:20 +02:00
Antoine Vandecreme
2c73b0fb44 Use Math.round instead of Math.floor and Math.ceil for overlay placement. 2015-10-09 14:15:54 -04:00
Larissa Smith
4b72399e8f Use the right queue item's options when replacing an item. 2015-10-08 16:29:01 -06:00
Larissa Smith
14e86cd30b Set autoRefigureSizes back to true at the end of the loadQueue. 2015-10-07 16:09:17 -06:00
Larissa Smith
4643851da9 Optimized adding large numbers of items to the world. 2015-09-25 09:58:34 -06:00
Grant Echols
c4aa3715a7 Fixed problem with missing .length in for loop of raiseAddItemFailed event. 
Added viewer._cancelPendingImages method that clears the loadQueue.
Added call to _cancelPendingImages from within the world.removeAll method.
 2015-09-23 15:19:02 -06:00
Larissa Smith
fc8b4db796 Fix for Chrome (v 45) issue that key is sometimes undefined outside of the for-in loop. 2015-09-17 15:45:39 -06:00
Ian Gilman
0003b1c193 Merge pull request #727 from TMUND/toni 
Fixed placeholderFillStyle flicker
 2015-09-16 09:34:46 -07:00
Ian Gilman
0126f588a7 Merge pull request #728 from LarissaSmith/master 
Fix for issue with tiledImages loading tiles at every level instead of just the best level:
 2015-09-16 09:27:44 -07:00
Toni Munder
a2ee81d7cb Fixed some code 2015-09-15 20:52:44 -07:00
Larissa Smith
418e21e9f4 Fix for issue with tiledImages loading tiles at every level instead of just the best level: using && instead of || means the tiledImage's longest side is used for comparison instead of the shortest side. 2015-09-15 15:58:34 -06:00
Ian Gilman
aa83e019fd Changelog for #715 and #725 2015-09-15 10:31:43 -07:00
Ian Gilman
e4b33623fa Merge pull request #725 from fs-webdev/master 
Added 'tile-load-failed' event
 2015-09-15 10:25:31 -07:00
Ian Gilman
4ac34b1190 Merge pull request #715 from LarissaSmith/master 
Added autoRefigureSizes flag for disabling calls to _figureSizes …
 2015-09-15 10:22:35 -07:00
Toni Munder
484ae63db1 Made some changes to flickering code 2015-09-14 20:45:52 -07:00
Larissa Smith
3fd51d81d7 Updated comments on setAutoRefigureSizes to eliminate reference to private variables and functions. 2015-09-14 16:14:32 -06:00
Grant Echols
4b3bfcb703 Cleaned up comments and renamed the event as per Ian's request to 'tile-load-failed' 2015-09-14 15:25:30 -06:00
Ian Gilman
b07e4b200a Merge pull request #719 from Emigre/umd 
registers an AMD module if possible
 2015-09-14 13:54:27 -07:00
Toni Munder
561d091005 Code for flickering tile 2015-09-13 19:20:34 -07:00
Larissa Smith
f4be8f859e Merge branch 'master' of https://github.com/openseadragon/openseadragon 2015-09-11 15:37:11 -06:00
Larissa Smith
60f114daf1 If autoRefigureSizes is set to true and bounds-change events have been skipped, call _figureSizes automatically. 2015-09-11 15:35:36 -06:00
Grant Echols
dd8baa1639 Added 'tile-open-failed' event to notify the app when a tile fails to load. 
This can happen when the image has authentication or other restrictions.
 2015-09-11 14:25:20 -06:00
Ian Gilman
63c066b6e5 Merge branch 'master' of github.com:openseadragon/openseadragon 2015-09-03 09:26:22 -07:00
Ian Gilman
9f2a2f361d Changelog for #711 2015-09-03 09:24:15 -07:00
Ian Gilman
19f35c293b Merge pull request #711 from AlbinoShaun/master 
Change resize behaviour to prevent "snapping" to world bounds
 2015-09-03 09:21:29 -07:00
Shaun Whitely
59a6a43379 Revert "Fixed navigator resize" 
- This reverts commit c825438339.
- Made navigator always use a minZoomImageRatio of 1
 2015-09-03 09:44:27 +10:00
Gaspar Rey
f799a1fe86 Add 'define' as a global in JSHint 2015-09-03 00:35:43 +01:00
Shaun Whitely
c825438339 Fixed navigator resize 
- Added navigatorMinZoomImageRatio with default of 1
 2015-09-02 15:58:47 +10:00
Gaspar Rey
00459189b1 Define as an AMD module if available 2015-09-02 00:10:53 +01:00
Larissa Smith
2c6dfb1b0b Changed this to _this and added documentation on setAutoRefigureSizes. 2015-09-01 10:48:41 -06:00
Shaun Whitely
6d3b582e58 Removed allowZoomToConstraintsOnResize and made the new resize behaviour 
the default
 2015-08-29 16:46:56 +10:00
Larissa Smith
913844b82b Merge branch 'master' of https://github.com/openseadragon/openseadragon 2015-08-28 16:51:36 -06:00
Larissa Smith
24be6a52ed Added autoRefigureSizes flag for disabling calls to _figureSizes during bounds-change event handlers. This improves performance when a lot of bounds-change events are fired in quick succession. Used flag to optimize world._arrange. 2015-08-28 16:10:26 -06:00
Ian Gilman
d673a453c6 Merge pull request #706 from LarissaSmith/master 
Added option in addTiledImage to replace tiledImage at index.
 2015-08-25 09:06:59 -07:00
Shaun Whitely
bd4921c285 Added option to avoid image from snapping to home bounds on resize. 2015-08-25 22:06:53 +10:00
Larissa Smith
7076d64b1b Fixed race condition for replacing a tiledImage where the world may have changed before the new tiledImage loads. Added test for replacing with addTiledImage. 2015-08-21 11:01:32 -06:00
Serge Markin
11024f44f2 FIXED: Rotation works improperly on retina display #683 2015-08-20 20:11:30 +08:00
Larissa Smith
f13691f60d Added option in addTiledImage to replace tiledImage at index. 2015-08-19 13:40:27 -06:00
Ian Gilman
bc6759e7fb Merge pull request #696 from avandecreme/master 
Avoid using eval when JSON.parse is available.
 2015-07-31 09:34:16 -07:00
Antoine Vandecreme
d960c69b34 Replace eval call when passing a Json string. 2015-07-30 16:44:41 -04:00
Antoine Vandecreme
4bb80067f7 Avoid using eval when JSON.parse is available. 2015-07-30 16:21:59 -04:00
Hasse Feldthaus
8e591d1108 Renamed ambiguous event label. 2015-07-29 18:27:23 +02:00
Hasse Feldthaus
29d5401eed Added some missing semicolons. 2015-07-29 18:19:45 +02:00
Hasse Feldthaus
565e7cd097 Added XDomainRequest as fallback method for ajax, if XMLHttpRequest fails. 2015-07-29 17:19:08 +02:00
Conner Wingard
b687332c9e Fix merge conflict in upstream changelog.txt 2015-07-14 16:46:47 -04:00
Conner Wingard
e1e345a4bc Clean up TileSource object when provided tileWidth/tileHeight for clarity. Add basic TileSource tests. 2015-07-14 14:49:52 -04:00
Conner Wingard
df7bd2e5ce Respect non-square tiles if available from IIIFTileSources 2015-07-10 14:26:51 -04:00
Ian Gilman
35c7a30dc2 Merge pull request #680 from LarissaSmith/master 
Adds collectionColumns as a configuration parameter
 2015-07-08 08:57:35 -07:00
Grant Echols
5539487814 Added error message tracking into the tile loading mechanism. This exposes the reason for the error in the console.log message 2015-07-06 15:07:00 -06:00
Grant Echols
9629f47c2c Added error message tracking into the tile loading mechanism. This exposes the reason for the error in the console.log message 2015-07-06 15:06:00 -06:00
Grant Echols
8b71876c37 Added error message tracking into the tile loading mechanism. This exposes the reason for the error in the console.log message 2015-07-06 14:57:15 -06:00
Larissa Smith
339401683f Added configuration parameter to allow a horizontal layout that has a fixed number of columns or a vertical layout that has a fixed number of rows. 2015-07-02 13:20:57 -06:00
Conner Wingard
c27a43e49e Fix calling the wrong function in IIIFTileSource to retrieve tile width 2015-07-02 11:24:43 -04:00
Conner Wingard
d11c4fe107 Remove TileSource.tileSize. Convert IIIFTileSource to override TileSource.getTileWidth and TileSource.getTileHeight. 2015-06-30 17:56:06 -04:00
Ian Gilman
6db00ad286 Overlay doc fixes 2015-06-30 10:58:51 -07:00
Ian Gilman
769221f659 Merge pull request #666 from fs-webdev/master 
Added code to handle the case where autoResize=true. In this mode th…
 2015-06-29 14:14:19 -07:00
Conner Wingard
201ca8a422 Revert changes to IIIFTileSource. Changes no longer needed for non square tiles 2015-06-29 14:37:35 -04:00
Conner Wingard
827fe4e836 Deprecate TileSource.getTileSize(), add TileSource.getTileWidth() and TileSource.getTileHeight() 2015-06-29 13:42:09 -04:00
Conner Wingard
85241b1249 Fix for maintaining IIIFTileSource support while implementing #670. Change docs to reflect that TileSource.prototype.tileSize is now an OpenSeadragon.Point 2015-06-26 16:26:09 -04:00
Conner Wingard
7e950fda2b Add support for viewing custom tile sources with non-square tiles 2015-06-26 14:17:40 -04:00
Grant Echols
0806e4d4ed Fixed comment regarding autoResize. 2015-06-25 14:14:05 -06:00
Grant Echols
df878f6f82 Changed preserveImageSizeOnResize to require autoResize=true. 
Refactored resizing code to share more code.
Removed preserveImageSizeOnResize parameter from viewer.
 2015-06-24 10:48:00 -06:00
Rick Smith
d2f1e432cd Use spaces not tabs 
Phew...flame war averted.   ;)
 2015-06-23 16:08:18 -06:00
Rick Smith
b1c6a75c49 When overlays are hidden, keep them that way 
Overlays previously had their display set to 'block' each time they were drawn.  Now if their display is 'none' their display property is left alone
 2015-06-23 16:04:40 -06:00
Grant Echols
fb21dabd76 Added configuration parameter: preserveImageSizeOnResize to preserve the default behavior. 
Changed fitBounds to fitBoundsWithConstraints as per Ian's instructions.
 2015-06-23 10:55:57 -06:00
Grant Echols
57c06a9a19 Fixed problem with build complaining about variable name reuse. 2015-06-22 13:35:45 -06:00
Grant Echols
1c14f5cc94 Added code to handle the case where autoResize=false. In this mode the image size is preserved and the center is maintained. 
This may be considered changing the default behavior so I'd welcome a suggestion to add a configuration parameter to help preserve the default behavior.
 2015-06-22 13:29:51 -06:00
Ian Gilman
6ffc81760c Merge pull request #662 from avandecreme/coordinates 
Add coordinates conversion methods to TiledImage.
 2015-06-19 13:13:12 -07:00
Antoine Vandecreme
5e653b4796 Fix assert in cacheTile. 2015-06-15 16:43:34 -04:00
Antoine Vandecreme
d671049a17 Fix and add unit tests. 2015-06-11 15:27:36 -04:00
Antoine Vandecreme
8a6177b729 Add tile-unloaded event. 2015-06-11 13:18:17 -04:00
Antoine Vandecreme
584daea732 Doc and test messages fix. 2015-06-11 10:59:32 -04:00
Antoine Vandecreme
606d25dbe6 Merge upstream. 2015-06-08 10:38:16 -04:00
Antoine Vandecreme
d5c431b1cd Integrate Ian's comments. 2015-06-03 14:40:20 -04:00
Antoine Vandecreme
2674104007 Fix flickering tiles with useCanvas=false when no cache is used. Fix #661 2015-06-03 14:34:18 -04:00
Antoine Vandecreme
aa021d87c0 Add coordinates conversion methods to TiledImage. 2015-06-02 16:41:37 -04:00
Antoine Vandecreme
be657c0b3d Add getCompletionCallback method. 2015-06-02 12:59:38 -04:00
Antoine Vandecreme
4c1d0f9a4c Fix Ian's comments. 2015-06-02 11:35:59 -04:00
Antoine Vandecreme
eda47e6fc0 Add tile-loaded event. 2015-05-29 15:10:47 -04:00
Antoine Vandecreme
2538f2023c Move tile caching code inside tilecache.js. 2015-05-29 11:49:58 -04:00
Antoine Vandecreme
dd782a427e Add documentation on pre-full-screen event. Fix #487 2015-05-16 10:36:00 -04:00
Ian Gilman
efa8ccff35 * Keyboard pan speed is now the same regardless of zoom level (#645) 2015-05-05 17:20:20 -07:00
Antoine Vandecreme
dd07771415 Fix drawer.clear 2015-04-22 18:30:49 -04:00
Antoine Vandecreme
9d053c545b Fix Ian's comments. 2015-04-20 19:25:36 -04:00
Antoine Vandecreme
44395662d1 Add opacity support. 2015-04-19 16:10:37 -04:00
Philip Giuliani
0d056145a3 💄 Rename to drawRectangle 2015-04-15 18:31:56 +02:00
Philip Giuliani
9df77ee915 Return early in drawDebugInfo 2015-04-15 13:40:12 +02:00
Philip Giuliani
21d32b59f5 Pass tiledImage and context to the placeholderFillStyle function 2015-04-15 13:32:41 +02:00
Philip Giuliani
6b1580824a Remove contextSaved 2015-04-14 19:43:41 +02:00
Philip Giuliani
6677953d87 Save and restore inside of the drawer 2015-04-13 19:05:23 +02:00
Philip Giuliani
3ce7024e97 Revert to usedClip 2015-04-13 19:02:04 +02:00
Philip Giuliani
425acc38f9 Fix overwriting the tiledImage options 2015-04-13 18:59:13 +02:00
Philip Giuliani
e3ae7b56f1 :docs: Document placeholderFillStyle 2015-04-11 19:01:09 +02:00
Philip Giuliani
ff6e604b94 Add comment 2015-04-10 16:20:54 +02:00
Philip Giuliani
f8503bd6ac Add placeholderFillStyle option to tiledImage 2015-04-10 14:31:08 +02:00
Philip Giuliani
5958c50d62 Update tiledImage to use the new function of the drawer 2015-04-09 19:57:55 +02:00
Philip Giuliani
1a230d8b9f Add viewportToDrawerRectangle to Drawer 2015-04-09 19:57:28 +02:00
Philip Giuliani
da819ac15a Add possibility to draw gradients and images 2015-04-09 14:25:07 +02:00
Philip Giuliani
4523454ff1 Add option to define the fillStyle of the placeholder 2015-04-09 13:44:55 +02:00
Philip Giuliani
50e46b104e Extract rect calculation 2015-04-08 21:45:38 +02:00
Philip Giuliani
6778533642 Call drawPlaceholder when no tiles are drawn 2015-04-08 20:14:13 +02:00
Philip Giuliani
fc56c4e2ef Add method to draw a placeholder 2015-04-08 20:13:56 +02:00
Ian Gilman
332b28ab2d * Now animating zoom spring exponentially 2015-03-30 14:50:37 -07:00
Ian Gilman
ac7689d45b Merge branch 'master' into spring 2015-03-27 16:04:27 -07:00
Ian Gilman
e433863f09 Test for clip feature 2015-03-20 10:09:33 -07:00
Ian Gilman
c27f68640f Docs for clip feature, as well as get and set 2015-03-19 16:38:52 -07:00
Ian Gilman
e1d36ffb14 First version of clip feature 2015-03-18 10:03:44 -07:00
Ian Gilman
b395f1793d Logarithmic option for springs; used for zoomSpring 2015-03-17 16:43:25 -07:00
Ian Gilman
19ade7d76d Improved zoom and pan constraints 2015-03-11 15:41:36 -07:00
Philip Giuliani
75b0d316f8 Forgot var 2015-03-03 09:36:04 +01:00
Philip Giuliani
8dc8779fee Clear the imageLoader when re-drawing 2015-03-03 09:29:44 +01:00
Philip Giuliani
6bf3b8d7d4 Set loading to false when job is aborted 2015-03-03 09:29:31 +01:00
Philip Giuliani
55ea2c3b51 Call abort on all jobs before the queue gets cleared 2015-03-03 09:29:23 +01:00
Antoine Vandecreme
a372274ee1 Fix Cross Origin policy not working (#612) 
Remove useless hostUrl field
 2015-02-26 17:57:31 -05:00
edsilv
89d488bb7e removed show/hide controls 2015-02-24 14:55:46 +00:00
edsilv
de4ad6dde6 Merge branch 'master' into ed 2015-02-24 14:47:32 +00:00
edsilv
cf063a71f5 Merge remote-tracking branch 'upstream/master' 2015-02-24 12:05:07 +00:00
edsilv
cc18a85591 when reloading, viewerSize is being set to 0, 0. check that x and y have a non-zero value, otherwise results in IE8 error when rounding NaN 2015-02-21 12:00:21 +00:00
edsilv
a5394c62f7 show/hide controls 2015-02-21 11:44:04 +00:00
edsilv
22bfbac916 Merge remote-tracking branch 'upstream/master' 2015-02-21 11:36:43 +00:00
Martin Pluta
cfd2693fc7 added destroy and clear methods to resolve tile caching issue 2015-02-20 21:12:34 +01:00
Ian Gilman
f118ae9407 Minor preserveOverlays cleanup 2015-02-13 13:26:44 -08:00
Antoine Vandecreme
6662001aae Fixed Firefox 35 not able to open local files (#588) 2015-02-10 18:28:05 -05:00
Ian Gilman
88c488d706 For multi-image open, drawing isn't started until all tileSources have been opened 2015-02-10 11:30:36 -08:00
edsilv
4d8ab41808 remove show/hide controls 2015-02-09 21:29:17 +00:00
edsilv
1f494b16d1 Merge branch 'ed' 2015-02-09 21:19:07 +00:00
Jonas Daniel
f5f6ee5831 Fixed x/y typo in reference strip. 
Typo caused horizontal strip to be rendered only relative to height, not to width as it should. On typical landscape sized screens this forced only ~half the reference strip to be (pre-)rendered at any time.
 2015-02-09 21:19:30 +01:00
edsilv
c5a8074b1e ignore .idea files, added show/hide controls methods 2015-02-06 13:58:13 +00:00
Ian Gilman
4bf40bffc1 Merge branch 'master' into collections 2015-02-05 14:46:43 -08:00
Ian Gilman
1e8731a2ba Merge branch 'collections' into m2 
Fixed Conflicts:
	changelog.txt
 2015-02-04 09:35:20 -08:00
Ian Gilman
bd1dad7829 Merge pull request #583 from wesleyfok/collections 
WIP basic high pixel density support re: openseadragon/openseadragon#541
 2015-02-04 09:10:50 -08:00
Wesley Fok
65c8ed6f36 drawDebugInfo is now high-dpi aware 2015-02-03 14:45:39 -05:00
Jon Stroop
32338efe32 wasn't using canonical syntax 2015-02-03 10:14:46 -05:00
Wesley Fok
b67cf2aa08 Fixed tile image canvas being too large 2015-01-30 16:40:34 -05:00
Wesley Fok
832ba62df0 Remove unneeded $.console.log calls 2015-01-30 16:03:45 -05:00
Wesley Fok
28ddf5a809 Backed out old coordinate translation modifications, moving pixel density check to rendering code 2015-01-30 15:46:52 -05:00
Wesley Fok
a23da44b8f Clean up $.pixelDensityRatio comments 2015-01-29 15:14:41 -05:00
unknown
3402d33088 WIP basic high pixel density support re: openseadragon/openseadragon#541 2015-01-29 11:19:49 -05:00
Ian Gilman
ae3b100483 Merge branch 'collections' into m2 2015-01-22 11:16:09 -08:00
Ian Gilman
735fcc3e37 Merge branch 'master' into collections 
fixed Conflicts:
	src/navigator.js
	src/openseadragon.js
 2015-01-22 11:15:45 -08:00
Mark Salsbery
c2ebbbe1af Merge branch 'master' into viewer_focus 
Conflicts:
	changelog.txt
 2015-01-21 14:59:41 -08:00
Mark Salsbery
43d8924513 Added tabIndex option to viewer 2015-01-21 12:47:42 -08:00
Mark Salsbery
1e8b3a1ea6 Removed Viewer focusHandler/onCanvasFocus 
Presumably, this was meant to manually scroll the viewer into view when it receives focus. This is already handled by browsers when tabbing to the viewer, so doing it explicitly isn't necessary, and it creates a negative user experience when clicking on a viewer to give it focus (as of #569).
 2015-01-21 11:49:19 -08:00
Mark Salsbery
1da57564df Merge branch 'master' into mousetracker_defaulton 
Conflicts:
	changelog.txt
	src/navigator.js
 2015-01-21 11:18:52 -08:00
Mark Salsbery
406005c8c9 Removed dead code 2015-01-21 09:42:03 -08:00
Mark Salsbery
2fd2da465b Merge branch 'master' into navigator_disable 
Conflicts:
	changelog.txt
 2015-01-21 09:38:40 -08:00
Mark Salsbery
545997bace MouseTracker now defaults to tracking on (#558) 2015-01-20 18:35:58 -08:00
Ian Gilman
2172da6aaa * Fixed an error in fitBounds that occurred sometimes with immediately = true 2015-01-20 17:19:13 -08:00
Ian Gilman
2b9a51036f Fixed change detection for viewport (after recent spring change) 2015-01-20 16:09:54 -08:00
Mark Salsbery
1151a9343e Merge branch 'master' into navigator_disable 
Conflicts:
	changelog.txt
 2015-01-20 14:01:45 -08:00
Mark Salsbery
674a208d95 Replace base class innerTracker instead of using a new one 2015-01-20 13:56:06 -08:00
Mark Salsbery
912f82d36d IE 11 fix and Merge branch 'master' into mousetracker_MSPointerEvent 
Conflicts:
	changelog.txt
 2015-01-20 13:28:30 -08:00
Ian Gilman
897a237807 Added viewport-change event; fixed spring reset 2015-01-20 11:23:34 -08:00
Mark Salsbery
198d4de0e6 Added setMouseNavEnabled() and isMouseNavEnabled() method overrides to Navigator (#572) 2015-01-20 11:01:09 -08:00
Mark Salsbery
3b01014ac8 Fixed pointer event model detection for IE 10 (#571) 2015-01-20 10:26:14 -08:00
Mark Salsbery
e87020cf78 Removed 'position' property from MouseTracker keyDownHandler/keyUpHandler/keyHandler functions 
Positional data is not available in the corresponding DOM event objects
 2015-01-20 09:48:28 -08:00
Ian Gilman
732cd87a10 Merge branch 'collections' into m2 
fixed Conflicts:
	changelog.txt
 2015-01-19 10:45:26 -08:00
Ian Gilman
dc1a7c9cc5 Merge branch 'master' into collections 
fixed Conflicts:
	src/viewer.js
 2015-01-19 10:35:31 -08:00
Mark Salsbery
0f5c205656 Cut/pasted code fix 2015-01-17 11:25:24 -08:00
Mark Salsbery
412ebce94d Keyboard navigation fixes 
Removed textarea element from Viewer DOM. Viewer.canvas now handles keyboard navigation.
 2015-01-17 11:18:55 -08:00
Ian Gilman
1765e3c0c9 Merge pull request #537 from bitjutsu/bug-500-keyboard-nav 
fix #500 - requests keyboard focus when canvas is clicked
 2015-01-16 16:58:11 -08:00
Mark Salsbery
2831771af5 MouseTracker - keyboard handling 
1) MouseTracker - added keydown and keyup handlers
2) Modifier keys ignored in keyboard  navigation handlers (#503)
3) Arrow key navigation fixed across platforms (#565)
 2015-01-16 16:26:30 -08:00
Mark Salsbery
8e5e2168c8 Ensure capture released in abortTouchContacts() 2015-01-16 08:33:34 -08:00
Ian Gilman
c55daff222 Merge pull request #553 from openseadragon/ajax 
Allowing XHRs withCredentials for authenticated requests
 2015-01-15 14:35:06 -08:00
Mark Salsbery
00aae52a08 Fix container-enter/container-exit event properties 2015-01-15 12:37:54 -08:00
Mark Salsbery
cb56e352cf Mousetracker Improvements 
1) MouseTracker - Simulated touchenter/touchleave events now bubble to parent element MouseTrackers
2) MouseTracker - Improved multitouch support in enter/exit event handlers
3) MouseTracker - orphaned tracked touch pointers removed (fix for #539)
4) MouseTracker - removed touchenter/touchleave event support since the events don't exist on any known platform and have been removed from the W3C specification
5) Removed Viewer onContainerPress/onContainerRelease handlers (and the associated 'container-release' event ) that were never fired due to the canvas (child) element capturing the DOM events
6) Added 'canvas-enter', 'canvas-exit', and 'canvas-press' events to Viewer
7) ButtonGroup - removed obsolete MouseTracker event handlers
 2015-01-15 12:15:22 -08:00
Ian Gilman
3232ba4fe5 * Fixed an error in fitBounds if the new and old bounds were extremely close in size 2015-01-14 17:06:18 -08:00
Mark Salsbery
d26d3f9393 MouseTracker - Improved IE 9+ compatibility 2015-01-14 08:44:14 -08:00
Ian Gilman
e4c3dfc8dd Added Rect.union; allowed minZoomLevel greater than home zoom 2015-01-13 15:31:52 -08:00
Ian Gilman
ef20ccc1e7 Merge branch 'collections' into m2 2015-01-13 14:12:14 -08:00
Ian Gilman
17b8f356ed Merge branch 'master' into collections 2015-01-13 14:11:52 -08:00
Ian Gilman
373631ae32 Merge branch 'collections' into m2 2015-01-12 16:47:39 -08:00
Mark Salsbery
0d6fca35c1 Fix pointer type passed to capturePointer/releasePointer in pointer events model. 
Remembered to change the test shim as well.
 2015-01-12 16:08:26 -08:00
Mark Salsbery
e4c549927b Merge remote-tracking branch 'upstream/master' into mousebuttons479 
Conflicts:
	changelog.txt
 2015-01-12 15:36:19 -08:00
Mark Salsbery
83ff365121 Revert "capturePointer()/releasePointer() call fix for pointer event model" 
This reverts commit d582a9563f.
 2015-01-12 15:33:51 -08:00
Mark Salsbery
1c465ec59c Revert "Second attempt: capturePointer()/releasePointer() call fix for pointer event model" 
This reverts commit 1bdb83dc58.
 2015-01-12 15:33:18 -08:00
Ian Gilman
a411215eba Merge branch 'master' into collections 
fixedConflicts:
	src/openseadragon.js
 2015-01-12 14:31:20 -08:00
Ian Gilman
83b7d7597a Added a note about preserveOverlays 2015-01-12 14:22:10 -08:00
Ian Gilman
753bf64e8a * Fixed: DZI tilesource was broken 2015-01-12 14:18:39 -08:00
Ian Gilman
0fd94bb048 Merge branch 'master' into collections 
fixed Conflicts:
	changelog.txt
	src/viewer.js
 2015-01-12 14:10:49 -08:00
Mark Salsbery
1bdb83dc58 Second attempt: capturePointer()/releasePointer() call fix for pointer event model 2015-01-12 12:56:18 -08:00
Mark Salsbery
d582a9563f capturePointer()/releasePointer() call fix for pointer event model 2015-01-12 12:26:38 -08:00
Mark Salsbery
755854d3f7 Renamed non-primary button events/handlers 2015-01-12 11:02:54 -08:00
Mark Salsbery
30b5ec04c6 MouseTracker Improvements 
* Exposed secondary pointer button (middle, right, etc.) events from MouseTracker and through viewer (#479)
* MouseTracker - Improved IE 8 compatibility
 2015-01-10 14:49:02 -08:00
Younes El Alami
1d16b01a28 Changed _this.source.overlays to _this.overlays, https://github.com/openseadragon/openseadragon/pull/561/files#r22730318 2015-01-10 12:11:45 +00:00
Ian Gilman
4fa6fea850 Scrollwheel for thumbs (m2) 2015-01-09 11:45:53 -08:00
Younes El Alami
9e07c96d29 Added preserveOverlays option to Viewer 2015-01-09 02:21:16 +00:00
Ian Gilman
a336b23667 Documentation for ajaxWithCredentials-related changes 2015-01-02 16:07:11 -08:00
Ian Gilman
c820f9f918 Added ajaxWithCredentials option 2015-01-02 15:45:46 -08:00
Ian Gilman
56ee5bd3c5 Viewport and tiledImage test fixes 2015-01-02 14:24:05 -08:00
Ian Gilman
a7d9f7dcd5 Fixed broken defaultZoomLevel and homeFillsViewer options 2015-01-02 11:44:35 -08:00
Ian Gilman
cd329016bb Merge branch 'collections' into bugs 2015-01-02 11:19:44 -08:00
Ian Gilman
48eaf7c805 Merge branch 'master' into collections 2014-12-31 15:17:43 -08:00
Mark Salsbery
b39d31a845 MouseTracker - Added explicit pointer capture for touch event model events 2014-12-31 14:30:10 -08:00
Ian Gilman
68dfc79101 Merge branch 'collections' into bugs 2014-12-31 11:16:33 -08:00
Ian Gilman
0edef40db2 Merge branch 'master' into collections 2014-12-31 11:13:27 -08:00
Mark Salsbery
8d4c776cd0 MouseTracker fixes for #502, #518, #527, #539 2014-12-30 12:57:17 -08:00
Ian Gilman
b141a22c87 Merge pull request #544 from kim-company/fix-imageloader 
Fix the jobLimit of the imageLoader
 2014-12-29 11:48:20 -08:00
Adam Carruthers
6e49f80248 Prevent mobile keyboard from opening 
Adds readonly property to .keyboard-command-area to prevent
input, but allow keys to be captured.
 2014-12-22 20:29:44 -07:00
Philip Giuliani
b8a7d33ebb Fix documentation of jobLimit 2014-12-22 08:51:57 +01:00
Ian Gilman
c9708399a1 Fixed bug with passing single literal tilesource on construction 2014-12-19 15:32:19 -08:00
Ian Gilman
f1610425bc Navigator now updates when items are moved 2014-12-19 13:57:08 -08:00
Ian Gilman
c0163f7d6b Merge branch 'collections' into bugs 
fixed Conflicts:
	test/demo/collections/main.js
 2014-12-19 11:58:41 -08:00
Philip Giuliani
71cbd84879 Fix case of filename 
All files are downcased so far.
 2014-12-19 16:06:21 +01:00
Philip Giuliani
b82f5cea76 Fixed imageLoaderLimit 
Currently jobsInProgress was not incremented after adding a job. So it
has gone into the - range and was like unlimited jobs.
 2014-12-19 15:50:19 +01:00
Philip Giuliani
c737bad66e Fix the jobLimit of the imageLoader 
Fixes #490
 2014-12-19 15:17:15 +01:00
Ian Gilman
e98d47e3ce Fixed erroneous "undefined" asserts 2014-12-18 15:21:48 -08:00
Adam Carruthers
69e9326d4f fix #500 - requests keyboard focus when canvas is clicked 
The canvas click listener will now check if keyboard-command-area has
focus, and if it does not, it will request it.
 2014-12-04 17:06:33 -05:00
Ian Gilman
28b1296105 IE8 fixes for DZI and World.removeItem 2014-12-04 12:00:04 -08:00
Ian Gilman
6b0e44d037 Merge branch 'collections' into ian2 
fixed Conflicts:
	test/demo/collections/main.js
 2014-12-03 13:37:44 -08:00
Ian Gilman
211127b87b Fixed window resize for navigator with multi-image 2014-12-03 11:13:06 -08:00
Ian Gilman
09e494091e More fixes for tiledImage animation 2014-12-02 13:17:56 -08:00
Ian Gilman
6a7f56d858 tiledImage bounds animation now works 2014-12-02 11:44:02 -08:00
Ian Gilman
7078826be1 Auto-resize now works for multi-image 2014-12-01 16:29:21 -08:00
Ian Gilman
4e788473b0 image springs start 2014-11-24 17:47:16 -08:00
Ian Gilman
bf9ccd5458 tile-drawing event now includes tiledImage 2014-11-24 13:25:20 -08:00
Ian Gilman
2de44c752d Using "viewport coordinates" instead of "world coordinates" 2014-11-24 11:59:06 -08:00
Ian Gilman
66517dab8d Coordinate conversion rounding errors were causing test breakages; fixed 2014-11-24 11:46:33 -08:00
Ian Gilman
d5c345970c Coordinate conversion functions for TiledImage 2014-11-21 16:32:04 -08:00
Ian Gilman
2a5fd0b0f7 Fixed "toImage" converters 2014-11-21 15:18:25 -08:00
Ian Gilman
2336b81618 TiledImage update events now include which tiled image 2014-11-20 16:41:43 -08:00
Ian Gilman
36831d3434 Testing deprecations 2014-11-20 16:02:02 -08:00
Ian Gilman
68fbdc7beb * Overlays appear in the DOM immediately on open or addOverlay (#507) 2014-11-20 15:33:13 -08:00
Ian Gilman
78f65152bc Fixed: overlays were appearing under the canvas 2014-11-20 14:50:07 -08:00
Ian Gilman
78e44d487b TileCache tests 2014-11-20 11:51:24 -08:00
Ian Gilman
3449ba1961 tiledImage tests 2014-11-18 17:12:15 -08:00
Ian Gilman
b7c78812c5 Items added with addTiledImage are now added in correct sequence 2014-11-18 15:45:03 -08:00
Ian Gilman
643332902d Unit tests for World 2014-11-17 16:24:40 -08:00
Ian Gilman
0e31b67ca5 ReferenceStrip fixes 2014-11-17 14:03:14 -08:00
Ian Gilman
336482cd1c Viewer.open now honors sequence mode 2014-11-17 12:57:49 -08:00
Ian Gilman
f018059b60 Docs for sequence mode 2014-11-17 11:50:20 -08:00
Ian Gilman
1279c6766c More sequence mode work 2014-11-14 17:19:04 -08:00
Ian Gilman
0dd97dbc56 First version of sequence mode 2014-11-14 16:51:02 -08:00
Ian Gilman
b371af712e Fixed broken test 2014-11-14 15:49:42 -08:00
Ian Gilman
9347cfe692 Event handler cleanup for tiled images in world 2014-11-12 16:44:11 -08:00
Ian Gilman
1ed80b0d27 Docs and naming changes for collection mode 2014-11-12 16:31:46 -08:00
Ian Gilman
c4c17db045 Supporting collectionTileSize and collectionTileMargin 2014-11-12 15:48:38 -08:00
Ian Gilman
56ddf8c9c3 First steps for collection mode 2014-11-11 17:14:48 -08:00
Ian Gilman
1159711e26 Fixed broken navigator unit test 2014-11-10 16:25:17 -08:00
Ian Gilman
e02a2d55cc Fixed issue with navigator size when viewer is zero size to start 2014-11-10 15:53:38 -08:00
Ian Gilman
55759a6906 Merge branch 'master' into collections 2014-11-10 14:39:43 -08:00
Ian Gilman
7fcdbf210e One extra merge conflict 2014-11-07 17:15:11 -08:00
Ian Gilman
30a1005fb8 Merge branch 'master' into merger 
fixed Conflicts:
	src/drawer.js
 2014-11-07 17:13:48 -08:00
Ian Gilman
b15b94799c Merge branch 'issue-464' of github.com:SupplyFrame/openseadragon into SupplyFrame-issue-464 2014-11-07 15:48:57 -08:00
Ian Gilman
fab33ea1af Merge branch 'imageLoaderPatch' of github.com:rdlester/openseadragon into rdlester-imageLoaderPatch 
fixed Conflicts:
	src/drawer.js
 2014-11-07 15:29:34 -08:00
Ian Gilman
b5a9116a0b Fixed rotation with multiple images 2014-11-05 16:39:35 -08:00
Ian Gilman
8bdc55bd63 Fixed fitVertically and fitHorizontally 2014-11-05 15:57:44 -08:00
Ian Gilman
a9c9478752 Wraparound now works for images of other widths than 1 2014-11-05 15:24:31 -08:00
Ian Gilman
e52e2fef34 Improved docs 2014-11-05 14:48:37 -08:00
Ian Gilman
8641279890 Better tile caching for duplicate images 2014-11-05 13:48:27 -08:00
Ian Gilman
8466a91470 One more doc fix 2014-11-04 11:57:58 -08:00
Ian Gilman
d346d165f8 Updated documentation 2014-11-04 11:53:39 -08:00
Ian Gilman
31c15aed69 Merge branch 'collections' into ian 
fixed Conflicts:
	src/viewer.js
	test/demo/collections/main.js
 2014-11-04 09:58:09 -08:00
Ian Gilman
43292c9bcb Merge branch 'collections' into margins 2014-11-04 09:42:45 -08:00
Ian Gilman
de2d473db6 Merge branch 'master' into collections 
fixed Conflicts:
	test/test.html
 2014-11-04 09:41:28 -08:00
Ian Gilman
00c2881c64 Fixed test breakages 2014-11-03 17:14:17 -08:00
Ian Gilman
f8156991ef More doc tweaks 2014-10-29 17:23:54 -07:00
Ian Gilman
a68be6ac68 You can now open multiple images when creating via OpenSeadragon() 2014-10-29 17:14:46 -07:00
Ian Gilman
72aa6c4669 Docs for Viewer.open() 2014-10-29 17:06:14 -07:00
Ian Gilman
4d6be50c05 More cleanup for open() changes 2014-10-29 16:39:43 -07:00
Ian Gilman
95836a6ad1 Major overhaul to Viewer.open() 2014-10-29 16:11:21 -07:00
nein09
19844c8f42 Incorporate code review feedback, add a times method to the Rect class. 2014-10-29 09:42:19 -07:00
Ben Delarre
61d757e86b Merge branch 'master' into issue-465 2014-10-27 14:07:10 -07:00
Ian Gilman
fb6280644a Merge branch 'collections' into margins 
fixed Conflicts:
	test/demo/collections/main.js
 2014-10-24 15:27:14 -07:00
Ian Gilman
3e1870cde0 Navigator now updates for item index changes and removals 2014-10-24 15:18:32 -07:00
Ian Gilman
46cd2ab800 Fixed issue with top/left margins; cleaned up naming 2014-10-21 17:11:09 -07:00
Ian Gilman
a14bea39aa More margins work 2014-10-17 14:27:24 -07:00
Ian Gilman
2a7f48ef60 Cleanup and docs for margins 2014-10-16 15:19:05 -07:00
Ian Gilman
2d8652046a First stab at margins 2014-10-16 14:00:07 -07:00
Ian Gilman
a08e361512 Navigator following host viewer's world events 2014-09-24 13:58:09 -07:00
Ian Gilman
e02209092c Navigator now works with multiple images 2014-09-23 16:15:03 -07:00
Ben Delarre
1d1b9bf01a Added support for pointer API so this now works in IE11. 2014-09-23 14:31:53 -07:00
Ben Delarre
f07108ec2d Updated implementation to better pass tests, still not 100% though. 2014-09-23 11:26:42 -07:00
Ian Gilman
63996a7d92 Merge branch 'master' into collections 
fixed Conflicts:
	src/viewport.js
 2014-09-17 16:05:23 -07:00
iangilman
356b7e1f5f Merge pull request #474 from nein09/issue-127 
Add option for home button to fill viewer (issue 127)
 2014-09-15 13:24:55 -07:00
Ben Delarre
7278793e5c Fixed notation for travis build. 2014-09-12 16:22:55 -07:00
Ben Delarre
2a8cb43d02 Fixes issue #464 by adding mouseout handler to document and calling mouseUp handler 2014-09-12 16:01:19 -07:00
nein09
b0613a5971 Revert "Merge remote-tracking branch 'origin/issue-127' into issue-127" 
oh god help

This reverts commit ffa2ee1e8d, reversing
changes made to 2163e5230c.
 2014-09-12 15:31:05 -07:00
nein09
8b368f72f7 I somehow missed saving the jsdoc change in my last commit. 2014-09-12 14:50:43 -07:00
nein09
9b66eeee99 Merge remote-tracking branch 'origin/master' into issue-127 2014-09-12 10:41:19 -07:00
nein09
741978caf9 Incorporate code review feedback for Openseadragon isue 127. Added appropriate default values and docs to openseadragon.js; restored a blank line that I accidentally deleted. 2014-09-12 10:33:48 -07:00
Rob Sanderson
d6c3ccfd31 scale_factors -> scaleFactors in 2.0 API 2014-09-04 12:04:31 -07:00
nein09
2e4e187b21 Adding functionality for https://github.com/openseadragon/openseadragon/issues/127 - option for home button to fill rather than fit. 
- Added a option to pass to the OpenSeadragon constructor called homeFillsViewer, which defaults to false. If true, the home button will fill the viewer with the image, centered on the image's center, zoomed to fill the viewer at the image's smallest dimension, and clipped at the image's largest dimension. For example, a very tall, thin image in a 4:3 aspect ratio viewer will zoom so that the width of the image fills the viewer, and most of the height of the image is clipped.
 2014-08-29 11:53:29 -07:00
Ian Gilman
6f0f23e728 Fixed constraints for when homeBounds.x or y is negative 2014-08-26 15:12:49 -07:00
Ian Gilman
5a1a41428b Merge branch 'master' into collections 
fixed Conflicts:
	src/drawer.js
 2014-08-26 11:53:03 -07:00
iangilman
b8c5d62782 Merge pull request #468 from PathXL/rotate-pinch 
Implements pinch rotate.
 2014-08-26 10:45:17 -07:00
iangilman
ff2e0a1c55 Merge pull request #466 from PathXL/free-hand-rotation 
Allow all rotation angles
 2014-08-26 10:44:37 -07:00
Dominik Picheta
e9382ffbf7 Fixes doc comment. 2014-08-26 14:56:24 +01:00
Dominik Picheta
0ff6eb443d Added pinchRotate option. 2014-08-22 15:22:00 +01:00
Dominik Picheta
c3b292cfb1 Fix code style issue. 2014-08-22 14:57:20 +01:00
Ian Gilman
52aa693531 Merge branch 'master' into collections 2014-08-21 10:13:13 -07:00
Ian Gilman
7b80263718 Reinstating a small check. 2014-08-21 10:11:21 -07:00
Dominik Picheta
097714cf39 Implements pinch rotate. 2014-08-20 12:03:42 +01:00
Dominik Picheta
ea80c05a05 Replace error for non right-angle rotations in Rect.rotate. 2014-08-20 09:21:02 +01:00
Ian Gilman
1f13d1f909 Moved update-viewport event 2014-08-19 15:43:36 -07:00
Ian Gilman
33f0fa1e4b World cleanup; viewer layer function deprecation 2014-08-19 15:02:04 -07:00
rlskoeser
fd0d8d4507 always use getElementsByTagNameNS since it will work for DZI xml with or without ns prefix 2014-08-19 13:47:51 -04:00
Dominik Picheta
1c63c96f04 Increase viewport bounds slightly for rotation. 2014-08-19 15:56:23 +01:00
Dominik Picheta
a8b6c8d0e1 Merge branch 'master' into free-hand-rotation 2014-08-19 10:00:12 +01:00
Dominik Picheta
e00e4c53ef Proper viewport bounds changes for rotation. 2014-08-19 09:51:27 +01:00
Ian Gilman
8efad6f3a0 Fixed home/constraints for multi-image. 2014-08-18 16:04:49 -07:00
rlskoeser
343f9ed367 correct typo in fallback ns logic for pulling display rect nodes 2014-08-18 14:37:37 -04:00
rlskoeser
0d92737ff2 check length instead of undefined for DisplayRect nodes tagname ns fallback 2014-08-18 14:17:37 -04:00
rlskoeser
df90308b0e use getElementsByTagNameNS for namespaced DZI xml when getElementsByTagName fails 2014-08-18 14:10:36 -04:00
Ian Gilman
26e9575f41 Merge branch 'collections' into ian 2014-08-15 14:50:19 -07:00
Ian Gilman
1cc29db432 Merge branch 'master' into collections 
fixed Conflicts:
	src/viewport.js
 2014-08-15 14:49:56 -07:00
iangilman
e93578fa54 Merge pull request #455 from PathXL/fixes-192 
Fixes #192.
 2014-08-15 09:59:28 -07:00
Dominik Picheta
50f9a82089 Small rotation fixes. 2014-08-15 15:47:50 +01:00
Dominik Picheta
01303787ce Cleanup. 2014-08-15 09:46:27 +01:00
rlskoeser
8662bf9496 use localName instead of tagName, to support dzi xml with namespaces 2014-08-14 18:06:29 -04:00
Dominik Picheta
3353bd5f69 Support other rotation angles. 2014-08-13 15:52:20 +01:00
Dominik Picheta
873135b492 Adds rotate event. Fixes #454. 2014-08-13 10:53:52 +01:00
Ian Gilman
5c7c1d5b6c Moved Viewport.goHome to Viewer.goHome. 2014-08-12 16:44:53 -07:00
Ian Gilman
66b8d7e191 Previous cleanup was a little too aggressive. 2014-08-12 16:15:17 -07:00
Ian Gilman
2ee59635fa World.getHomeBounds() 2014-08-12 16:04:55 -07:00
Dominik Picheta
afd8b48d6b Fixes #192. 
Navigator can now rotate together with the viewer.
 2014-08-12 15:27:16 +01:00
Ian Gilman
45b7118732 Further cleanup 2014-08-11 17:04:20 -07:00
Ian Gilman
94080c3180 Cleaned up tileCache code. 2014-08-08 16:32:43 -07:00
Ian Gilman
f04d538b5b Deprecated layer functions in viewer; additional cleanup. 2014-08-08 16:15:23 -07:00
Ian Gilman
d86edff931 Merge branch 'collections' into ian 
fixed Conflicts:
	src/drawer.js
 2014-08-08 11:38:13 -07:00
Ian Gilman
82637d95a5 Merge branch 'master' into collections 2014-08-08 11:32:14 -07:00
Dominik Picheta
a2334353f7 Merge branch 'master' into fix-195 2014-08-08 12:19:48 +01:00
Dominik Picheta
29b69a9e83 Fixes #195: debug feature now works with rotation. 2014-08-08 12:18:05 +01:00
Ian Gilman
b43ac582dc Merge branch 'collections' into ian 2014-08-07 10:06:44 -07:00
Ian Gilman
00c7315989 Merge branch 'master' into collections 
fixed Conflicts:
	src/viewport.js
 2014-08-07 10:06:15 -07:00