mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-21 20:56:09 +03:00
Code Issues Projects Releases Wiki Activity
1,309 Commits 12 Branches 28 Tags 35 MiB
d5c345970c
Commit Graph

1309 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
iangilman
2631118e1c Merge pull request #473 from openseadragon/ian 
Fixed snapping issue with collections
 2014-08-26 15:31:13 -07:00
Ian Gilman
349e6125ea Improved collections demo: gridTest, crossTest 2014-08-26 15:27:55 -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
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
3dcf4cad57 Added changelog for multi-image 2014-08-21 10:44:32 -07:00
Ian Gilman
52aa693531 Merge branch 'master' into collections 2014-08-21 10:13:13 -07:00
Ian Gilman
984cc79cc6 Merge branch 'master' of github.com:openseadragon/openseadragon 2014-08-21 10:12:44 -07:00
iangilman
d7991234df Merge pull request #450 from openseadragon/ian 
WIP: Splitting drawer into drawer/tileCache/tiledImage; adding World
 2014-08-21 10:11:58 -07:00
Ian Gilman
7b80263718 Reinstating a small check. 2014-08-21 10:11:21 -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
Ian Gilman
1f13d1f909 Moved update-viewport event 2014-08-19 15:43:36 -07:00
Ian Gilman
08a38a8602 More test fixes. 2014-08-19 15:27:04 -07:00
Ian Gilman
b2e2b2b125 Renamed layers.js to multi-image.js 2014-08-19 15:03:45 -07:00
Ian Gilman
98111212cd Converted layer tests to multi-image tests 2014-08-19 15:02:35 -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
796588ace2 Unit test fixes. 2014-08-18 16:32:21 -07:00
Ian Gilman
8efad6f3a0 Fixed home/constraints for multi-image. 2014-08-18 16:04:49 -07:00