mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-22 13:16:10 +03:00
Code Issues Projects Releases Wiki Activity
1,409 Commits 12 Branches 28 Tags 35 MiB
8f45207820
Commit Graph

1409 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ian Gilman
8f45207820 m2 constraints 2015-01-13 15:33:03 -08:00
Ian Gilman
e4c3dfc8dd Added Rect.union; allowed minZoomLevel greater than home zoom 2015-01-13 15:31:52 -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
Ian Gilman
aa735c1e00 Changelog fix 2015-01-13 09:27:39 -08:00
Ian Gilman
5f9822fe68 Merge pull request #562 from msalsbery/mousebuttons479 
MouseTracker Improvements
 2015-01-13 09:24:38 -08:00
Mark Salsbery
cc1b6b7c6f Minor events.js test comment fix 2015-01-13 08:41:02 -08:00
Ian Gilman
373631ae32 Merge branch 'collections' into m2 2015-01-12 16:47:39 -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
e4c549927b Merge remote-tracking branch 'upstream/master' into mousebuttons479 
Conflicts:
	changelog.txt
 2015-01-12 15:36:19 -08:00
Mark Salsbery
83ff365121 Revert "capturePointer()/releasePointer() call fix for pointer event model" 
This reverts commit d582a9563f.
 2015-01-12 15:33:51 -08:00
Mark Salsbery
1c465ec59c Revert "Second attempt: capturePointer()/releasePointer() call fix for pointer event model" 
This reverts commit 1bdb83dc58.
 2015-01-12 15:33:18 -08:00
Ian Gilman
a411215eba Merge branch 'master' into collections 
fixedConflicts:
	src/openseadragon.js
 2015-01-12 14:31:20 -08:00
Ian Gilman
83b7d7597a Added a note about preserveOverlays 2015-01-12 14:22:10 -08:00
Ian Gilman
00edbe565a Changelog for #563 2015-01-12 14:21:57 -08:00
Ian Gilman
4af47ad905 Merge pull request #563 from openseadragon/dzi 
Fixed: DZI tilesource was broken
 2015-01-12 14:19:43 -08:00
Ian Gilman
753bf64e8a * Fixed: DZI tilesource was broken 2015-01-12 14:18:39 -08:00
Ian Gilman
0fd94bb048 Merge branch 'master' into collections 
fixed Conflicts:
	changelog.txt
	src/viewer.js
 2015-01-12 14:10:49 -08:00
Ian Gilman
7b6f7d6a5b Changelog for #561 2015-01-12 13:40:33 -08:00
Mark Salsbery
1bdb83dc58 Second attempt: capturePointer()/releasePointer() call fix for pointer event model 2015-01-12 12:56:18 -08:00
Mark Salsbery
d582a9563f capturePointer()/releasePointer() call fix for pointer event model 2015-01-12 12:26:38 -08:00
Mark Salsbery
755854d3f7 Renamed non-primary button events/handlers 2015-01-12 11:02:54 -08:00
Ian Gilman
b9f2f95cee Merge pull request #561 from ShadOoW/master 
Added preserveOverlays option to Viewer
 2015-01-12 09:53:17 -08:00
Mark Salsbery
becd11b6ce Added unit tests 2015-01-11 10:06:07 -08:00
Mark Salsbery
ad838e7fd4 changelog update 2015-01-10 14:51:56 -08:00
Mark Salsbery
30b5ec04c6 MouseTracker Improvements 
* Exposed secondary pointer button (middle, right, etc.) events from MouseTracker and through viewer (#479)
* MouseTracker - Improved IE 8 compatibility
 2015-01-10 14:49:02 -08:00
Younes El Alami
1d16b01a28 Changed _this.source.overlays to _this.overlays, https://github.com/openseadragon/openseadragon/pull/561/files#r22730318 2015-01-10 12:11:45 +00: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
Younes El Alami
9e07c96d29 Added preserveOverlays option to Viewer 2015-01-09 02:21:16 +00: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
8ff70dd54f Started 1.2.1 2015-01-05 13:21:19 -08:00
Ian Gilman
d694c7ea6c Version bump 2015-01-05 13:17:05 -08:00
Ian Gilman
56cd480736 Merge pull request #545 from openseadragon/bugs 
Various collections fixes
 2015-01-02 15:10:14 -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
cd329016bb Merge branch 'collections' into bugs 2015-01-02 11:19:44 -08:00
Ian Gilman
48eaf7c805 Merge branch 'master' into collections 2014-12-31 15:17:43 -08:00
Ian Gilman
92fa9cf36a Merge pull request #552 from msalsbery/mousetracker 
MouseTracker - Added explicit pointer capture for touch event model events
 2014-12-31 15:16:42 -08:00
Mark Salsbery
05ba23ea55 changelog update - added PR # 2014-12-31 14:41:27 -08:00
Mark Salsbery
49e1a8b8e2 changelog update 2014-12-31 14:39:37 -08:00
Mark Salsbery
b39d31a845 MouseTracker - Added explicit pointer capture for touch event model events 2014-12-31 14:30:10 -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
Ian Gilman
3e76bfdd9e Changelog for #518 2014-12-31 11:08:06 -08:00