mirror/openseadragon
1
0
Fork 0
mirror of https://github.com/openseadragon/openseadragon.git synced 2024-11-30 00:56:08 +03:00
Code Issues Projects Releases Wiki Activity
2,607 Commits 12 Branches 28 Tags 35 MiB
f7f2f501f5
Commit Graph

329 Commits

Author SHA1 Message Date
Mei-Hui Su
3cfe8ecac2 Merge https://github.com/openseadragon/openseadragon 2016-01-14 12:32:54 -08:00
Mei-Hui Su
087507c823 1) update according to comments from openseadragon's 2016-01-07 12:47:17 -08:00
Mei-Hui Su
ea833a780c Update to allow setting of globalCompositeOperation when 
html <canvas> is used to process multiple tiledImages to blend
is a specific way.
(special handling,
   when compositeOperation is 'source-over' and opacity is 1,
   useSketch is false, otherwise useSketch is true
)
Valid values are 'source-atop', 'source-in', 'source-out',
  'destination-over', 'destination-atop', 'destination-in',
  'destination-out', 'lighter', 'copy' or 'xor'
http://www.w3schools.com/tags/canvas_globalcompositeoperation.asp
 2016-01-06 07:58:36 -08:00
Petar Petrov
7406727090 Merge branch 'master' of https://github.com/openseadragon/openseadragon 2015-11-16 16:44:31 +02:00
Ian Gilman
b3b1a32717 Merge pull request #760 from avandecreme/imagetilesource 
Add ImageTileSource. Fix #467
 2015-11-11 10:32:09 -08:00
Petar Petrov
515c15bf98 various fixes for edge smoothing - #755 2015-11-05 16:19:56 +02:00
Petar Petrov
8c4fcc9ca9 tile edge smoothing at high zoom - #755 2015-11-04 17:04:50 +02:00
Antoine Vandecreme
14a83e1154 Add IE8 support in ImageTileSource. 2015-11-02 18:35:11 -05:00
Grant Echols
40edbd7a1c Updates as per code review requests 2015-10-28 17:07:51 -06:00
Grant Echols
ad4bbb9daf Changed name of config parameter to include 'MS' to suggest milliseconds. 2015-10-27 15:33:39 -06:00
Grant Echols
19c6179533 Added a patch to help slow down the scroll devices that fire too fast. This new code reduces the number of 'canvas-scroll' events that fire and slows down the zoom process. 2015-10-27 14:00:45 -06:00
Larissa Smith
fc8b4db796 Fix for Chrome (v 45) issue that key is sometimes undefined outside of the for-in loop. 2015-09-17 15:45:39 -06:00
Ian Gilman
b07e4b200a Merge pull request #719 from Emigre/umd 
registers an AMD module if possible
 2015-09-14 13:54:27 -07:00
Ian Gilman
9f2a2f361d Changelog for #711 2015-09-03 09:24:15 -07:00
Gaspar Rey
f799a1fe86 Add 'define' as a global in JSHint 2015-09-03 00:35:43 +01:00
Gaspar Rey
00459189b1 Define as an AMD module if available 2015-09-02 00:10:53 +01:00
Ian Gilman
bc6759e7fb Merge pull request #696 from avandecreme/master 
Avoid using eval when JSON.parse is available.
 2015-07-31 09:34:16 -07:00
Antoine Vandecreme
4bb80067f7 Avoid using eval when JSON.parse is available. 2015-07-30 16:21:59 -04:00
Hasse Feldthaus
8e591d1108 Renamed ambiguous event label. 2015-07-29 18:27:23 +02:00
Hasse Feldthaus
29d5401eed Added some missing semicolons. 2015-07-29 18:19:45 +02:00
Hasse Feldthaus
565e7cd097 Added XDomainRequest as fallback method for ajax, if XMLHttpRequest fails. 2015-07-29 17:19:08 +02:00
Larissa Smith
339401683f Added configuration parameter to allow a horizontal layout that has a fixed number of columns or a vertical layout that has a fixed number of rows. 2015-07-02 13:20:57 -06:00
Grant Echols
0806e4d4ed Fixed comment regarding autoResize. 2015-06-25 14:14:05 -06:00
Grant Echols
df878f6f82 Changed preserveImageSizeOnResize to require autoResize=true. 
Refactored resizing code to share more code.
Removed preserveImageSizeOnResize parameter from viewer.
 2015-06-24 10:48:00 -06:00
Grant Echols
fb21dabd76 Added configuration parameter: preserveImageSizeOnResize to preserve the default behavior. 
Changed fitBounds to fitBoundsWithConstraints as per Ian's instructions.
 2015-06-23 10:55:57 -06:00
Antoine Vandecreme
9d053c545b Fix Ian's comments. 2015-04-20 19:25:36 -04:00
Philip Giuliani
21d32b59f5 Pass tiledImage and context to the placeholderFillStyle function 2015-04-15 13:32:41 +02:00
Philip Giuliani
e3ae7b56f1 :docs: Document placeholderFillStyle 2015-04-11 19:01:09 +02:00
Philip Giuliani
f8503bd6ac Add placeholderFillStyle option to tiledImage 2015-04-10 14:31:08 +02:00
Philip Giuliani
da819ac15a Add possibility to draw gradients and images 2015-04-09 14:25:07 +02:00
Philip Giuliani
4523454ff1 Add option to define the fillStyle of the placeholder 2015-04-09 13:44:55 +02:00
Antoine Vandecreme
a372274ee1 Fix Cross Origin policy not working (#612) 
Remove useless hostUrl field
 2015-02-26 17:57:31 -05:00
Ian Gilman
f118ae9407 Minor preserveOverlays cleanup 2015-02-13 13:26:44 -08:00
Antoine Vandecreme
6662001aae Fixed Firefox 35 not able to open local files (#588) 2015-02-10 18:28:05 -05:00
Ian Gilman
bd1dad7829 Merge pull request #583 from wesleyfok/collections 
WIP basic high pixel density support re: openseadragon/openseadragon#541
 2015-02-04 09:10:50 -08:00
Wesley Fok
a23da44b8f Clean up $.pixelDensityRatio comments 2015-01-29 15:14:41 -05:00
unknown
3402d33088 WIP basic high pixel density support re: openseadragon/openseadragon#541 2015-01-29 11:19:49 -05:00
Ian Gilman
735fcc3e37 Merge branch 'master' into collections 
fixed Conflicts:
	src/navigator.js
	src/openseadragon.js
 2015-01-22 11:15:45 -08:00
Mark Salsbery
43d8924513 Added tabIndex option to viewer 2015-01-21 12:47:42 -08:00
Ian Gilman
c55daff222 Merge pull request #553 from openseadragon/ajax 
Allowing XHRs withCredentials for authenticated requests
 2015-01-15 14:35:06 -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
0fd94bb048 Merge branch 'master' into collections 
fixed Conflicts:
	changelog.txt
	src/viewer.js
 2015-01-12 14:10:49 -08:00
Younes El Alami
9e07c96d29 Added preserveOverlays option to Viewer 2015-01-09 02:21:16 +00:00
Ian Gilman
a336b23667 Documentation for ajaxWithCredentials-related changes 2015-01-02 16:07:11 -08:00
Ian Gilman
c820f9f918 Added ajaxWithCredentials option 2015-01-02 15:45:46 -08:00
Ian Gilman
2de44c752d Using "viewport coordinates" instead of "world coordinates" 2014-11-24 11:59:06 -08:00
Ian Gilman
f018059b60 Docs for sequence mode 2014-11-17 11:50:20 -08:00
Ian Gilman
1ed80b0d27 Docs and naming changes for collection mode 2014-11-12 16:31:46 -08:00
Ian Gilman
c4c17db045 Supporting collectionTileSize and collectionTileMargin 2014-11-12 15:48:38 -08:00
Ian Gilman
d346d165f8 Updated documentation 2014-11-04 11:53:39 -08:00
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
72aa6c4669 Docs for Viewer.open() 2014-10-29 17:06:14 -07:00
Ian Gilman
2a7f48ef60 Cleanup and docs for margins 2014-10-16 15:19:05 -07:00
Ian Gilman
63996a7d92 Merge branch 'master' into collections 
fixed Conflicts:
	src/viewport.js
 2014-09-17 16:05:23 -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
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
Dominik Picheta
0ff6eb443d Added pinchRotate option. 2014-08-22 15:22:00 +01: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
Dominik Picheta
afd8b48d6b Fixes #192. 
Navigator can now rotate together with the viewer.
 2014-08-12 15:27:16 +01:00
Ian Gilman
b43ac582dc Merge branch 'collections' into ian 2014-08-07 10:06:44 -07:00
Ian Gilman
00c7315989 Merge branch 'master' into collections 
fixed Conflicts:
	src/viewport.js
 2014-08-07 10:06:15 -07:00
Ian Gilman
dbb60c0ab2 Splitting drawer into drawer/tileCache/tiledImage; adding World 2014-08-06 13:48:18 -07:00
Mark Salsbery
e9b7634499 Added $.setElementTouchActionNone function 2014-08-05 16:57:54 -07:00
Mark Salsbery
c6bea68b4e Merge branch 'master' into IE9-MouseTracker-Clicks 2014-08-05 07:00:05 -07:00
Mark Salsbery
e11095968c Mousetracker Over/Out Tracking Fixes 2014-08-04 21:41:07 -07:00
Ian Gilman
6066fa2eeb Cleanup and docs. 2014-07-31 16:17:46 -07:00
Ian Gilman
02b606680d Updated to latest npm packages 2014-06-02 11:02:22 -07:00
iangilman
af383668d4 Merge pull request #392 from msalsbery/Double-Tap 
Add Double-Click/Tap Gesture to MouseTracker (#300)
 2014-04-28 10:01:23 -07:00
Mark Salsbery
5806eed7f4 Merge remote-tracking branch 'origin/master' into IE-Browser-Detection 2014-04-24 12:50:21 -07:00
Mark Salsbery
8232546d51 Merged upstream changes, fixed conflicts 2014-04-24 12:40:49 -07:00
iangilman
c0a3333663 Merge pull request #387 from msalsbery/Touch-Enter-Event 
MouseTracker Touch Fixes - Flick Defaults and Bubbling
 2014-04-24 10:32:35 -07:00
iangilman
669925776a Merge pull request #379 from avandecreme/ajax-file 
Fix ajax call for file: and ftp: #73
 2014-04-24 10:02:44 -07:00
Mark Salsbery
e900b605af Update changelog.txt 
Updated changelog.

Misc documentation fixes.
 2014-04-22 09:41:29 -07:00
Mark Salsbery
7567a657bd Add Double-Click/Tap Gesture to MouseTracker (#300) 
Fix for enhancement #300
Added double-click/tap gesture detection to MouseTracker.with
corresponding dblClickHandler event callback.
Added unit test for double-click detection.
Added Viewer dblClickHandler handling to optionally zoom on
double-click.
 2014-04-22 09:23:56 -07:00
Antoine Vandecreme
e7ca7b1e95 Prefer DOMParser over ActiveX when both are availables. 2014-04-21 09:23:17 -04:00
Mark Salsbery
765df51bd3 Stiffened the spring 2014-04-20 21:25:29 -07:00
Mark Salsbery
5860167d65 MouseTracker Touch Fixes - Flick Defaults and Bubbling 
Flick gesture settings defaults set to better values.
Removed touch event model bubble cancelling so viewer controls show on
touch contact.
 2014-04-20 18:19:32 -07:00
Mark Salsbery
8589ebef0d Fix for IE 11 Browser Detection 
Proposed temporary fix until we don't need browser  sniffing anymore.
 2014-04-19 12:10:48 -07:00
Antoine Vandecreme
6a24af3743 Add @private to internal methods. 2014-04-18 16:59:47 -04:00
Antoine Vandecreme
116cf7449f Test if activex is available by trying to create one for ie11 compatibility. 2014-04-17 17:20:04 -04:00
Antoine Vandecreme
3b4dca329d Use ActiveX on IE when requesting a file: URL with ajax. 2014-04-17 16:13:26 -04:00
Mark Salsbery
c2e7b376b0 pinchToZoom gesture option added, misc. fixes 
changelog update.
pinchToZoom gesture option added.
Event unit tests cleaned up.
 2014-04-15 19:19:47 -07:00
Antoine Vandecreme
47ae094675 Fix ajax call for file: and ftp: #73 2014-04-15 12:55:32 -04:00
Mark Salsbery
e8e0f28f5a Merge Upstream Changes 2014-04-15 06:40:46 -07:00
Mark Salsbery
09bfd55add MouseTracker fixes and tests 
Separated event-model/device specific event handling code from
event-model/device agnostic event handling code.
Use enter/leave events instead of over/out events.
Updated unit tests for above changes.
Added unit tests for mouse gestures.
Updated changelog for breaking changes and deprecations.
 2014-04-14 18:17:18 -07:00
Ian Gilman
5dafa32f5d Changelog for #376 and spelling fix 2014-04-09 09:06:46 -07:00
iangilman
a2a5387a83 Merge pull request #376 from avandecreme/hide-controls 
Add showZoomControl, showHomeControl and showFullPageControl options to ...
 2014-04-09 09:04:35 -07:00
Antoine Vandecreme
e27df5327f Improve documentation. 2014-04-09 10:18:51 -04:00
Antoine Vandecreme
dbe87d659e Disable CORS by default. 2014-04-07 16:59:48 -04:00
Antoine Vandecreme
16ee82d43b Add showZoomControl, showHomeControl and showFullPageControl options to be able to hide specific controls. See #210 
Add missing doc for buttons.
Set the rotate buttons to viewer.rotate(Left/Right)Button for coherence with other buttons.
Update tests.
 2014-04-07 14:11:33 -04:00
Mark Salsbery
642c302225 Changelog, documentation, options update 2014-04-03 10:06:12 -07:00
Mark Salsbery
dc48a31412 Exposed gesture settings as options 2014-04-03 08:50:25 -07:00
Mark Salsbery
b8ea87d3f8 MouseTracker Fixes 
Fixed mouse capture, should work on IE8 without IE8-specific code.
 2014-04-01 18:27:54 -07:00
Mark Salsbery
1475f5865d Multi-Touch MouseTracker Update 
Ready to pull request, merging upstream changes and running tests.
 2014-03-29 17:02:24 -07:00