Commit Graph

3351 Commits

Author SHA1 Message Date
Ian Gilman
de2d473db6 Merge branch 'master' into collections
fixed Conflicts:
	test/test.html
2014-11-04 09:41:28 -08:00
Ian Gilman
ab33d984d3 More unit test fixes 2014-11-04 09:38:16 -08:00
Ian Gilman
00c2881c64 Fixed test breakages 2014-11-03 17:14:17 -08:00
Ian Gilman
20d3571a8a Merge pull request #506 from nein09/viewport-tests
Viewport tests - here's what I have so far.
2014-11-03 11:25:11 -08:00
nein09
fd380afe7f Add tests for pixel <-> Point and viewport coordinates <-> image coordinates. Still working out the fine points of the target location. 2014-10-29 21:10:15 -07: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
Ian Gilman
3810916577 Added --min option for grunt watch 2014-10-29 16:01:06 -07:00
nein09
19844c8f42 Incorporate code review feedback, add a times method to the Rect class. 2014-10-29 09:42:19 -07:00
nein09
e0fbf869c9 Replace more magic numbers with constants. 2014-10-27 18:06:37 -07:00
nein09
2d70ee32fc Remove randomness from test cases. 2014-10-27 17:58:59 -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
817536929d Merge pull request #488 from openseadragon/ian
WIP: collections plus navigator
2014-10-24 15:22:09 -07:00
Ian Gilman
3e1870cde0 Navigator now updates for item index changes and removals 2014-10-24 15:18:32 -07:00
nein09
c1ae3d08f7 More constants, fewer magic numbers. 2014-10-23 16:30:34 -07:00
nein09
72a0ecc195 Force a zoom factor of 2 and make that a constant; find the viewer position in the window for imageToWindowCoordinates (still not sure where the 20 x 20 pixel padding is coming from 2014-10-23 16:13:02 -07:00
Ian Gilman
46cd2ab800 Fixed issue with top/left margins; cleaned up naming 2014-10-21 17:11:09 -07:00
nein09
8494b7ee7f Take out multiplication to avoid precision errors because it doesn't; add viewportToImageRectangle test 2014-10-21 11:19:41 -07:00
nein09
7cf4556cdc Merge remote-tracking branch 'origin/master' into viewport-tests 2014-10-20 15:43:21 -07:00
nein09
69143f786b Fix a bad merge of changelog.txt 2014-10-20 15:41:51 -07:00
Ian Gilman
a14bea39aa More margins work 2014-10-17 14:27:24 -07:00
Ian Gilman
afc488cecf Merge pull request #501 from gitter-badger/gitter-badge
Add a Gitter chat badge to README.md
2014-10-17 10:21:32 -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
nein09
d9bd3343cc viewerElementToImageCoordinates 2014-10-15 17:00:11 -07:00
nein09
c6dd2f213d imageToViewerElementCoordinates and imageToWindowCoordinates 2014-10-15 16:54:09 -07:00
nein09
38e9a4b10b Merge remote-tracking branch 'origin/master' into viewport-tests 2014-10-15 12:24:18 -07:00
nein09
59ee91ea1a add test for windowToImageCoordinates 2014-10-15 12:22:52 -07:00
nein09
13045e2ac4 Use propEqual to verify Point values, add a stub test for imageToWindowCoordinates 2014-10-15 11:45:19 -07:00
The Gitter Badger
1a1ad1f6f2 Added Gitter badge 2014-10-15 18:14:40 +00:00
nein09
e8d4c00c5f Add viewport.js to test.html so tests get run. Use built-in Point functions. Add a helper function to get a random number. 2014-10-09 16:58:45 -07:00
nein09
119ff4226d Add a new test file to hold the viewport tests, and a few new tests to it. 2014-10-02 13:20:28 -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
bbcb9c1219 Fixed bounds of test. 2014-09-23 11:32:37 -07:00
Ben Delarre
23c9155e52 Fixed comment. 2014-09-23 11:30:46 -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
Ian Gilman
c2fdddc306 Merge branch 'master' of github.com:openseadragon/openseadragon 2014-09-15 13:51:43 -07:00
Ian Gilman
8f016f97f9 Changelog for #474 2014-09-15 13:30:07 -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
iangilman
80bbd3c6e1 Merge pull request #476 from azaroth42/master
scale_factors -> scaleFactors in 2.0 API
2014-09-15 13:24:03 -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