Commit Graph

757 Commits

Author SHA1 Message Date
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
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
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
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