Commit Graph

479 Commits

Author SHA1 Message Date
Petar Petrov
7406727090 Merge branch 'master' of https://github.com/openseadragon/openseadragon 2015-11-16 16:44:31 +02:00
Ian Gilman
b3b1a32717 Merge pull request #760 from avandecreme/imagetilesource
Add ImageTileSource. Fix #467
2015-11-11 10:32:09 -08:00
Antoine Vandecreme
f4f30c2925 Fix race condition in navigator tests. 2015-11-09 19:02:31 -05:00
Petar Petrov
515c15bf98 various fixes for edge smoothing - #755 2015-11-05 16:19:56 +02:00
Antoine Vandecreme
03ed52c5b4 Remove duplicate isCanvasTainted function in tests. 2015-11-04 17:49:13 -05:00
Antoine Vandecreme
c041746366 Add ImageTileSource. Fix #467 2015-11-01 10:23:02 -05:00
Ian Gilman
4e168d734e Updated tests for #524 2015-10-29 13:31:33 -07: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
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
Grant Echols
9e142313d6 Added small checks around code to make m2 sample work locally. 2015-08-11 09:24:35 -06:00
Antoine Vandecreme
d960c69b34 Replace eval call when passing a Json string. 2015-07-30 16:44:41 -04:00
Ian Gilman
1c17374de1 Tweaks for #673 2015-07-15 09:50:15 -07: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
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
e93a0862bd Added demo for TileSource swapping 2015-07-03 10:19:10 -07:00
Rick Smith
cdf1942202 Create demo for creating an overlay 2015-06-23 16:02:46 -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
d671049a17 Fix and add unit tests. 2015-06-11 15:27:36 -04:00
Antoine Vandecreme
584daea732 Doc and test messages fix. 2015-06-11 10:59:32 -04:00
Antoine Vandecreme
fa868a039d Fix editorconfig config. 2015-06-11 10:49:32 -04:00
Antoine Vandecreme
606d25dbe6 Merge upstream. 2015-06-08 10:38:16 -04:00
Antoine Vandecreme
b9a6b7910e Add unit tests. 2015-06-04 15:32:10 -04:00
Antoine Vandecreme
7e39a528c0 Add tests for tile-loaded event. 2015-06-04 09:47:50 -04:00
Antoine Vandecreme
aa021d87c0 Add coordinates conversion methods to TiledImage. 2015-06-02 16:41:37 -04:00
Antoine Vandecreme
f5ede70018 Fix coordinates demo. 2015-05-09 12:49:32 -04:00
Antoine Vandecreme
39bd370930 Add opacity test in tiledimage. 2015-04-27 19:28:18 -04:00
Antoine Vandecreme
6bc5f1ff51 Fix drawer tests. 2015-04-22 20:12:38 -04:00
Ian Gilman
332b28ab2d * Now animating zoom spring exponentially 2015-03-30 14:50:37 -07:00
Ian Gilman
823e9c3d22 Non-Harvard version of M2 clip demo 2015-03-20 10:17:27 -07:00
Ian Gilman
e433863f09 Test for clip feature 2015-03-20 10:09:33 -07:00
Ian Gilman
e1d36ffb14 First version of clip feature 2015-03-18 10:03:44 -07:00
Ian Gilman
19ade7d76d Improved zoom and pan constraints 2015-03-11 15:41:36 -07:00
Ian Gilman
815cbd6019 Detail on/off button (m2) 2015-03-09 15:32:38 -07:00
Antoine Vandecreme
ed72ae748f Fix tests and coverage 2015-02-27 14:07:42 -05:00
Antoine Vandecreme
a372274ee1 Fix Cross Origin policy not working (#612)
Remove useless hostUrl field
2015-02-26 17:57:31 -05:00
Ian Gilman
2cd54648f0 Demos of alternates and details in non-Harvard version (m2) 2015-02-16 10:45:46 -08:00
Ian Gilman
70e08a02ce Positioning alternates better (m2) 2015-02-16 10:18:59 -08:00
Ian Gilman
725bc36c4e Detail view (m2) 2015-02-13 15:55:57 -08:00
Ian Gilman
de18b3dc63 Refactoring (m2) 2015-02-13 14:32:17 -08:00
Ian Gilman
ae7adad5cf Alternate images (m2) 2015-02-10 14:02:41 -08:00
Ian Gilman
5443eedebc Fixed positioning issue when going to book mode with tall images (m2) 2015-02-10 11:53:56 -08:00
Ian Gilman
f531a18531 Fixed mouse positioning (m2) 2015-02-10 11:42:36 -08:00
Ian Gilman
20443e30f1 Fixes for viewport tests with collections 2015-02-09 10:36:07 -08:00
Ian Gilman
6cb08a8b58 Merge branch 'master' into collections 2015-02-09 10:18:30 -08:00
Ian Gilman
0e67b9c204 Added TODO marker for #589 2015-02-09 09:24:43 -08:00
nein09
449e80bf24 Fix the viewport bounds for fitBoundsWithConstraints 2015-02-08 22:46:55 -08:00
Ian Gilman
5161793948 m2 readme 2015-02-04 10:23:24 -08:00
Ian Gilman
80d8d2e96f Prepped m2 demo for merging 2015-02-04 10:18:36 -08:00
nein09
ed0ffb14cf Change the fitBoundsWithConstraints test according to feedback (I think) 2015-02-01 23:29:30 -08:00
nein09
8ce77c51fb Merge branch 'master' into viewport-tests 2015-02-01 22:14:43 -08:00
Ian Gilman
408a8f6fd3 400+ collection; repeated nexts (m2) 2015-01-23 16:00:58 -08:00
Ian Gilman
a923c3f09c Fixed issues with panning in scroll view (m2) 2015-01-22 11:52:08 -08: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
545997bace MouseTracker now defaults to tracking on (#558) 2015-01-20 18:35:58 -08:00
Ian Gilman
54be2b4b48 Fixed issues with window resizing (m2) 2015-01-20 17:19:20 -08:00
Ian Gilman
ec2e4a4e8f Refactored how scrolling works (m2) 2015-01-20 16:10:24 -08:00
Ian Gilman
adbde4682f Constraining while zooming out (m2) 2015-01-20 11:23:56 -08:00
nein09
3d5efbdbf0 Reset content size and goHome 2015-01-19 15:51:55 -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
nein09
500d8c2348 Fit horizontally and vertically. 2015-01-16 16:30:54 -08:00
nein09
1debca9c41 Add panning tests 2015-01-16 16:14:18 -08:00
nein09
9d7424b1ce Add panning tests 2015-01-16 16:00:57 -08:00
nein09
cc382eb263 add refpoint to zoom tests. 2015-01-16 15:45:04 -08:00
Ian Gilman
8c9fbafb06 Resize (m2) 2015-01-15 14:32:42 -08:00
nein09
3d3f4dbee5 More viewport unit tests - resize, get and set rotation, and the start of zoomBy and zoomTo. 2015-01-15 12:36:01 -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
1da3418cbe Selection and hover for thumbs mode (m2) 2015-01-14 17:09:39 -08:00
Ian Gilman
fe2aa52caf Proper buffer for page and book modes (m2) 2015-01-14 15:09:48 -08:00
Ian Gilman
0c63f35de1 Consistent height for pages (m2) 2015-01-13 16:15:40 -08:00
Ian Gilman
e37564e58c Better constraints for zooming out from corners 2015-01-13 15:49:53 -08:00
Ian Gilman
8f45207820 m2 constraints 2015-01-13 15:33:03 -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
Mark Salsbery
cc1b6b7c6f Minor events.js test comment fix 2015-01-13 08:41:02 -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
755854d3f7 Renamed non-primary button events/handlers 2015-01-12 11:02:54 -08:00
Mark Salsbery
becd11b6ce Added unit tests 2015-01-11 10:06:07 -08:00
Ian Gilman
0429d8fe7f Using real book images (m2) 2015-01-09 15:46:57 -08:00
Ian Gilman
c1d93acb27 Better next/previous support (m2) 2015-01-09 15:11:11 -08:00
Ian Gilman
a470d10f4d * Scroll view: go to current page when entering mode; clamp at first and last (m2) 2015-01-09 14:04:45 -08:00
Ian Gilman
70e461c214 * Correct page height for thumbs (m2) 2015-01-09 13:53:48 -08:00
Ian Gilman
4fa6fea850 Scrollwheel for thumbs (m2) 2015-01-09 11:45:53 -08:00
Ian Gilman
3956e6013a Clicking into thumbnails (m2) 2015-01-08 14:04:31 -08:00
Ian Gilman
c3d9b102c5 First version of m2 POC 2015-01-08 13:22:23 -08:00
Ian Gilman
03fec96f33 Moved viewport test 2015-01-02 14:25:42 -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
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
a8b9e2b88f Fix for one viewport unit test 2014-12-19 16:53:30 -08:00
Ian Gilman
a0092a4298 Merge branch 'collections' into bugs 2014-12-19 16:14:46 -08:00
Ian Gilman
062ee6227b Merge branch 'master' into collections 2014-12-19 16:14:16 -08:00
Ian Gilman
c6b1efe85d Added pause and "add more" buttons to animation demo 2014-12-19 15:55:24 -08:00
Ian Gilman
c9708399a1 Fixed bug with passing single literal tilesource on construction 2014-12-19 15:32:19 -08:00
Ian Gilman
ce8b0358ff Test for item positions + navigator 2014-12-19 15:21:57 -08:00
Ian Gilman
f1610425bc Navigator now updates when items are moved 2014-12-19 13:57:08 -08:00
nein09
00510c6cc2 Refactor other looping tests that don't reopen the viewer in a similar manner. 2014-12-15 09:41:32 -08:00
nein09
aebfecb4e8 Factor out looping and reopening viewer into a helper method, based on Ian's example. 2014-12-14 13:15:50 -08:00
nein09
e901248816 Explicitly call viewport.update() after zooming and make the test expected values reflect that action. 2014-12-14 11:08:54 -08:00
Ian Gilman
40d8f84187 Testing 2014-12-12 16:28:02 -08:00
nein09
c4fac82489 Clean up errors found by SublimeLinter. 2014-12-12 12:51:50 -08:00
Ian Gilman
d1627f9975 Merge branch 'collections' into ian 2014-12-11 17:10:00 -08:00
Ian Gilman
549ce64238 Using highsmith for animation demo 2014-12-05 11:05:50 -08:00
Ian Gilman
222f942752 Animation demo 2014-12-04 13:36:02 -08: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
fd40c1a829 Test for tiledImage animation 2014-12-02 13:29:52 -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
bf9ccd5458 tile-drawing event now includes tiledImage 2014-11-24 13:25:20 -08:00
Ian Gilman
b8a1762a95 Unit tests for TiledImage unit conversion 2014-11-21 17:05:14 -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
632f09caa2 More drawer tests 2014-11-20 14:25:17 -08:00
Ian Gilman
78e44d487b TileCache tests 2014-11-20 11:51:24 -08:00
Ian Gilman
cf0059daa5 Reorganized test folder 2014-11-19 16:52:33 -08:00
Ian Gilman
e465c24f2b Support for generating code coverage reports 2014-11-19 16:46:05 -08:00
Ian Gilman
2508dd35f5 tiledImage tests for real 2014-11-19 09:28:09 -08:00
Ian Gilman
3449ba1961 tiledImage tests 2014-11-18 17:12:15 -08:00
Ian Gilman
613e03d413 Drawer tests; multi-image test 2014-11-18 16:28:08 -08:00
nein09
17fddb2ff5 Merge branch 'master' of https://github.com/nein09/openseadragon into viewport-tests 2014-11-18 13:19:35 -08:00
nein09
614261876d Incorporate code review feedback - instantiate the viewer for looping ZoomLevel tests, change a few little syntax things 2014-11-18 13:05:58 -08:00
Ian Gilman
643332902d Unit tests for World 2014-11-17 16:24:40 -08:00
Ian Gilman
b149b39b06 Reinstating sequence control tests 2014-11-17 14:06:10 -08:00
Ian Gilman
0e31b67ca5 ReferenceStrip fixes 2014-11-17 14:03:14 -08:00
Ian Gilman
4bd4dd5618 Reference strip testing 2014-11-17 13:17:24 -08:00
Ian Gilman
336482cd1c Viewer.open now honors sequence mode 2014-11-17 12:57:49 -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
nein09
20711c485b getContainerSize test 2014-11-13 17:19:36 -08:00
nein09
ca7f79c896 Aspect ratio test 2014-11-13 09:04:11 -08:00
nein09
f765ab9933 min and max zoom level tests 2014-11-13 08:55:15 -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
9ebdaee326 Merge branch 'collections' into ian 2014-11-10 14:40:12 -08:00
Ian Gilman
55759a6906 Merge branch 'master' into collections 2014-11-10 14:39:43 -08:00
Ian Gilman
1366bb7abe Touch-ups for #481 2014-11-07 16:07:04 -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
nein09
06e970bbc3 Last of the tests for pixel/point/rect conversion. 2014-11-06 18:30:24 -08:00