Commit Graph

1190 Commits

Author SHA1 Message Date
Ian Gilman
ffac82ce60 Merge branch 'rdlester-imageLoaderPatch' 2014-11-07 15:33:27 -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
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
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
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
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
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
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
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
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
ffa2ee1e8d Merge remote-tracking branch 'origin/issue-127' into issue-127 2014-09-12 15:25:45 -07:00
nein09
2163e5230c Retry the doc changes. 2014-09-12 15:23:25 -07:00
nein09
0003eb41d0 Revert "I somehow missed saving the jsdoc change in my last commit."
I somehow also blew away some changes that need to stay.

This reverts commit a809ed009d.
2014-09-12 15:21:00 -07:00
nein09
95b6f094e0 Revert "Changelog for #466 and #468"
This reverts commit bcb16de02b.
2014-09-12 15:19:28 -07:00
nein09
a809ed009d I somehow missed saving the jsdoc change in my last commit. 2014-09-12 15:09:19 -07:00
nein09
2712484e1e 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 15:09:19 -07:00
nein09
f0f6e93915 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-09-12 15:09:18 -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
38da88c794 Fixing 2.0 test info.json 2014-09-04 12:28:52 -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
bcb16de02b Changelog for #466 and #468 2014-08-26 10:49:10 -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
984cc79cc6 Merge branch 'master' of github.com:openseadragon/openseadragon 2014-08-21 10:12:44 -07:00
iangilman
8459750cf1 Merge pull request #465 from rlskoeser/ns-aware
Support dzi xml with namespaces in Firefox
2014-08-21 09:33:07 -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
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