Mark Salsbery
4152b8b866
Trailing whitespace fixes
2014-08-05 07:13:06 -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
48603ba260
Drawer creation now supports width or height rather than scale.
2014-07-31 15:54:20 -07:00
Ian Gilman
298bcc25fb
Merge branch 'master' into ian
2014-07-30 09:26:15 -07:00
Rob Sanderson
59225a7250
Missed a Multi in a comment again :(
2014-07-29 11:16:23 -07:00
Rob Sanderson
92d5f72ceb
Missed a Multi in a comment
2014-07-29 11:15:14 -07:00
Rob Sanderson
8a6a111698
Documentation and © fix
2014-07-29 11:12:05 -07:00
Rob Sanderson
69bf069038
navigator to request maxLevel tileSize
2014-07-28 12:17:45 -07:00
Rob Sanderson
984fb8c531
Fixed drawer, renamed source, fixed tests
2014-07-28 11:53:06 -07:00
Rob Sanderson
2c4440b5a2
Combined IIIF tilesource and dynamic tileSize
2014-07-25 16:31:13 -07:00
Ian Gilman
f97202833f
Merge branch 'master' into ian
...
fixed Conflicts:
src/viewport.js
2014-07-24 09:40:43 -07:00
iangilman
1e4288f770
Merge pull request #423 from henri-astre-msft/fitBoundsWithConstraints
...
add fitBoundsWithConstraints() to the viewport.
2014-07-24 09:28:53 -07:00
Ian Gilman
a3973a25e7
Added scaling to drawer.
2014-07-22 11:13:22 -07:00
Ian Gilman
ea6ee54136
Added x and y to drawer.
2014-07-17 16:24:28 -07:00
Ryan Lester
43f8dc74ea
Fixing CORS bug
2014-06-26 11:33:43 -07:00
Henri Astre
318071d3ce
Cleanup for PR comments
...
- raise 'constrain' event inside applyBoundaryConstraints
- fix demo title/filename
- various fixes (default immediately to false + add private for
documentation)
2014-06-23 16:10:01 -07:00
Henri Astre
9e6c46d484
Revert "hiding properly _ functions."
...
This reverts commit 118c2b2c87
.
2014-06-23 15:40:36 -07:00
Henri Astre
118c2b2c87
hiding properly _ functions.
2014-06-20 17:53:07 -07:00
Henri Astre
e67f6b4003
First attempt at removing duplicated code
...
I've created _applyBoundaryConstraints() and _fitBounds() to remove
duplicated code.
2014-06-20 13:44:59 -07:00
Henri Astre
f86f9063fd
Improve comment for destroy() method.
2014-06-18 12:56:36 -07:00
Henri Astre
48aded3824
add fitBoundsWithConstraints() to the viewport.
2014-06-18 11:11:34 -07:00
Henri Astre
a563bdb658
fix .close() called after .destroy() + spacing
2014-06-18 10:35:23 -07:00
Henri Astre
764fa3e34a
Fix memory leak while destroying the viewer.
2014-06-17 17:26:10 -07:00
iangilman
e4800a9455
Merge pull request #419 from esmondb/master
...
Removes unnecessary trailing commas which stops google's closure compile...
2014-06-16 09:11:24 -07:00
esmondb
59ab6562d3
Removes unnecessary trailing commas which stops google's closure compiler.
2014-06-14 10:15:40 +01:00
Ian Gilman
02b606680d
Updated to latest npm packages
2014-06-02 11:02:22 -07:00
esmondb
d9ddc5f65d
Fix for IIPServer style urls when using DZI.
2014-05-31 08:30:25 +01:00
Ryan Lester
06dcfadf20
Quick patch to fix mid-update image loaded callbacks
2014-05-21 18:29:40 -07:00
Ryan Lester
dd51df97ab
Added ImageLoader; loads batches of images using async queue pattern
2014-05-10 15:09:02 -07:00
Mark Salsbery
bd11af6571
Improved Viewer Options Support in Gesture Handling
...
Apply constrainDuringPan option in flick and drag gesture handling.
Apply panHorizontal and panVertical options in flick and pinch gesture
handling.
2014-05-06 11:39:02 -07:00
Mark Salsbery
5b995eb04b
Removed mousenter/mouseleave DOM Event Handling
...
Fixes #394
mouseenter/mouseleave are not implemented in Webkit very well, so
reverted to mouseover/mouseout.
2014-05-02 23:01:38 -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
iangilman
f0c92146d1
Merge pull request #385 from msalsbery/IE-Browser-Detection
...
Fix for IE 11 Browser Detection
2014-04-28 09:57:04 -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
6df9368f2c
Merge remote-tracking branch 'origin/master' into Firefox-Unit-Tests
2014-04-24 12:49:58 -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
bd52f38788
iOS touch enter/exit fix for BUttonGroup
2014-04-23 08:38:55 -07:00
Mark Salsbery
d9dfd0a435
iOS touch enter/exit fix
2014-04-23 08:07:48 -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
Mark Salsbery
1e80b5a916
Float to Integer Fix for 'px' values in Navigator
...
Also fixes unit tests on Firefox (#332 )
2014-04-19 11:48:26 -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
8e119d66e5
Minor naming changes
2014-04-16 06:40:19 -07: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
Mark Salsbery
9b15ca090b
Fallback to mouseover/mouseout,
2014-04-15 13:04:08 -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
Heath Nielson
c61a22f750
Support query parameters in DZI tileSource URLs
...
Any query parameters that are a part of the tileSource URL are added
to the tile URLs.
2014-04-10 14:08:19 -06: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
iangilman
59a00ddfd1
Merge pull request #377 from avandecreme/cors
...
Disable CORS by default.
2014-04-08 14:28:41 -07: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
Antoine Vandecreme
f7d65fa4cb
Make OpenSeadragon W3C compliant.
2014-04-04 16:14:32 -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
2c8af72f5e
Multi-Touch MouseTracker Fixes
...
Removed zoom on click for touch.
Added an isPrimary flag to gesture points.
Fixed documentation error and updated documentation and comments.
Implemented the stopHandler for mouse events.
2014-04-01 09:32:04 -07:00
Mark Salsbery
8df20a5b86
Multi-Touch MouseTracker Update
...
Removed artifact
2014-03-31 13:42:19 -07:00
Mark Salsbery
d324aea761
Multi-Touch MouseTracker Update
...
Refactored, fixed a couple bugs, unit tests working.
Issuing a pull request.
2014-03-31 12:54:37 -07:00
Mark Salsbery
73b7519471
Merge remote-tracking branch 'origin/master' into Pointer-Event-Model
2014-03-29 17:09:24 -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
iangilman
a4d877297e
Merge pull request #367 from avandecreme/master
...
Fix missed copy paste.
2014-03-27 09:05:00 -07:00
Antoine Vandecreme
37bc36a7e7
Fix missed copy paste.
2014-03-26 15:28:35 -04:00
Antoine Vandecreme
7055322ee3
Add support for old webkit. Add fullScreenApi.getFullScreenElement method. Remove old license.
2014-03-25 13:29:58 -04:00
Antoine Vandecreme
6e48de47ed
Remove useless parameter Element.ALLOW_KEYBOARD_INPUT
2014-03-25 11:59:48 -04:00
Antoine Vandecreme
009b75393f
Remove ActiveX for IE<11. Update changelog.
2014-03-25 11:34:46 -04:00
Antoine Vandecreme
a15c8b035f
Merge branch 'master' of https://github.com/openseadragon/openseadragon into fullscreen-inputs
2014-03-25 10:36:37 -04:00
Mark Salsbery
70716b0706
Merge remote-tracking branch 'origin/master' into Pointer-Event-Model
2014-03-24 14:47:18 -07:00
Antoine Vandecreme
639af65ea9
Remove duplicate method
2014-03-21 16:15:08 -04:00
Antoine Vandecreme
775f4eba25
Merge branch 'master' of https://github.com/openseadragon/openseadragon into optimization
2014-03-21 16:12:50 -04:00
Antoine Vandecreme
4a5ccea2f7
Update overlays unit tests.
2014-03-21 15:55:04 -04:00
Mark Salsbery
3c0ca21568
Merge remote-tracking branch 'origin/master' into Pointer-Event-Model
2014-03-21 11:54:28 -07:00
Mark Salsbery
f6dfe9b079
Multi-Touch MouseTracker Update
2014-03-21 11:45:20 -07:00
iangilman
184ba0dbea
Merge pull request #364 from sul-dlss/cors-policy
...
add crossOriginPolicy drawer configuration to enable or disable CORS image requests
2014-03-21 09:18:41 -07:00
Antoine Vandecreme
4be56cdb52
Overlays performance optimization. See #359
2014-03-20 15:39:31 -04:00
Chris Beer
3d028716fe
add crossOriginPolicy drawer configuration to enable or disable CORS image requests
2014-03-20 10:30:46 -07:00
Antoine Vandecreme
73eaf2ce96
Separate layers and overlays to ensure that overlays are always on top of layers.
2014-03-20 09:56:12 -04:00
Antoine Vandecreme
ba10c392a1
Merge branch 'master' into layers
...
Conflicts:
src/drawer.js
src/viewer.js
test/test.html
2014-03-19 16:24:48 -04:00
Antoine Vandecreme
c9df575347
Merge from master
2014-03-18 13:17:43 -04:00
Antoine Vandecreme
2473c809b2
Fix mistakes in doc.
2014-03-18 13:05:21 -04:00
Antoine Vandecreme
a0cb7ec10f
Fix fullscreen test on IE11
2014-03-17 17:33:26 -04:00
Antoine Vandecreme
3cfce81705
Update full screen API.
2014-03-17 17:01:36 -04:00
Mark Salsbery
d52df4a9bf
Multi-Touch MouseTracker Update
...
Pinch gesture fixups
2014-03-15 17:12:13 -07:00
Antoine Vandecreme
7852718be2
Fix style
2014-03-15 11:51:36 -04:00
Antoine Vandecreme
41cded608c
Use viewer.addOverlay instead of drawer.addOverlay in collection mode
2014-03-15 11:40:51 -04:00
Antoine Vandecreme
ecf10f5911
Fix test messages, add doc and factorize overlay object creation
2014-03-15 11:20:33 -04:00
Mark Salsbery
7aa0df1b66
Multi-Touch MouseTracker Update
...
Pinch zoom update
2014-03-14 14:15:09 -07:00
Mark Salsbery
38cae86659
Multi-Touch MouseTracker Update
2014-03-14 10:42:22 -07:00
Mark Salsbery
c7ea247baa
Initial commit - Multi-touch, pointer event MouseTracker
2014-03-10 11:49:51 -07:00
iangilman
08568b5354
Merge pull request #341 from fs-webdev/rotate-buttons
...
Added Rotate Left/Right buttons to standard controls
2014-03-07 10:05:36 -08:00
Grant Echols
95f0591210
Added message to clarify that the event only fires when <canvas> is being used.
2014-03-04 10:38:10 -07:00
Grant Echols
e368bd50aa
Added tests for rotate control on/off setting.
2014-03-03 14:45:30 -07:00
Grant Echols
5e0e8005d6
Tuned the configuration around the rotate left/right to work when the drawer is instantiated.
2014-03-03 11:14:09 -07:00
Grant Echols
60da75aede
Added configuration around the rotate left/right buttons. The default for showRotationControls is false to preserve existing functionality. Also added default tooltip strings for the buttons.
...
This version runts the tests fine locally using 'npm test'. It looks like the remote build was having a timeout issue which I couldn't reproduce.
2014-03-03 09:28:28 -07:00
Antoine Vandecreme
0f43cd5a16
Add deprecated drawers methods.
2014-03-01 08:32:38 -05:00
Grant Echols
be79249c9c
Added pre-draw event for tiles to allow applications to alter the image just prior to its rendering. This should enable invert, brightness, contrast, sharpen and other transformations to occur naturally through the 'tile-drawing' event listener.
...
The listener is given the 'rendered' object which is the pre-drawn image on a canvas context object. By altering the 'rendered' object the listener can alter the display results. Since this event gets fired multiple times for the tile, it is wise for the handler to track what their desired modifications are and to tag the 'tile' element to keep track of the modifications already applied.
2014-02-27 15:35:00 -07:00
Grant Echols
576df57cdc
Fixed code style issue.
2014-02-20 14:04:26 -07:00
Grant Echols
2fd1a849d1
Added rotate right/left buttons to default tools
2014-02-20 13:57:39 -07:00
Antoine Vandecreme
95c7668f68
Pass degrees from the viewer to the viewport. Fix #305
2014-02-05 15:52:31 -05:00
Antoine Vandecreme
aaad805727
Add test for fixed overlay + update doc
2014-02-05 14:57:47 -05:00
Antoine Vandecreme
ed5eae9a73
Fix imageToViewerElementCoordinates method and corresponding unit tests.
2014-02-04 17:02:11 -05:00
Antoine Vandecreme
e26727488f
Fix doc in point.js
2014-02-04 16:59:45 -05:00
Antoine Vandecreme
c4428db8a5
Fix crash when closing the viewer when no overlay has been added.
2014-01-31 11:49:44 -05:00
Antoine Vandecreme
695df873ca
Update the source when the base layer change.
2014-01-30 16:59:51 -05:00
Antoine Vandecreme
d43b6d86b5
Add layersAspectRatioEpsilon check
2014-01-30 16:43:35 -05:00
Antoine Vandecreme
365dad9317
Move all overlay code from drawer to viewer
2014-01-30 15:38:37 -05:00
Antoine Vandecreme
7210181b4f
Remove not working code
2014-01-29 16:31:13 -05:00
Antoine Vandecreme
53ec6889e0
Support removal of base layer.
2014-01-22 11:33:59 -05:00
Antoine Vandecreme
1c1cd0dc4d
Allow base layer reassignment if not in sequence mode.
2014-01-21 19:24:47 -05:00
Mark Salsbery
601f533fcf
Navigator update with tests update
...
Navigator hosted in viewer with navigatorMaintainSizeRatio==false (the
default) now maintains its area and aspect ratio.
Tests added for most (all?) navigator configurations.
2014-01-18 18:19:22 -08:00
Mark Salsbery
7ce552caf9
Navigator update
...
Allow navigators hosted in a user-supplied element to be styled by user.
2014-01-13 14:51:22 -08:00
Antoine Vandecreme
facccf7b45
Throw an error when trying to add a layer in collection mode.
2014-01-11 19:25:27 -05:00
Antoine Vandecreme
cd62ba7eca
Prevent adding collections as layers.
2014-01-11 19:15:28 -05:00
Antoine Vandecreme
f0f76b847e
Add viewer.getLayerAtLevel method and rename getLayerLevel to getLevelOfLayer.
...
Add layers unit test.
2014-01-11 18:08:04 -05:00
Antoine Vandecreme
56707bd4f7
Add viewer.getNumberOfLayers method
...
layers.html test file:
-display 2 layers after opening
-fix order
-add opacity demo
-add rotation demo
2014-01-11 12:52:44 -05:00
Mark Salsbery
23954d0adf
Merge remote-tracking branch 'origin/master' into Navigator-Resize
...
Conflicts:
changelog.txt
2014-01-08 14:03:47 -08:00
Jon Stroop
ddde07b614
style changes, per @iangilman on openseadragon/openseadragon#315
2014-01-07 14:59:44 -05:00
Antoine Vandecreme
63af1e7517
Uncomment version
2014-01-05 19:30:52 -05:00
Antoine Vandecreme
b542b90590
Fix $.indexOf pollyfill
...
Add the original options in addLayer events
Add layers demo page
2014-01-05 19:20:45 -05:00
Jon Stroop
24298dcbba
Only require IIIF level 1; Vary tile size based on src image when no tiles are reported. Toward openseadragon/openseadragon#313
2014-01-02 19:59:10 -05:00
Jon Stroop
e9c2b502c1
support iiif level 1
2013-12-18 17:34:39 -05:00
Mark Salsbery
cae29bb144
Merge remote-tracking branch 'origin/master' into Navigator-Resize
2013-12-16 12:53:34 -08:00
Mark Salsbery
1cac9fa533
Navigator cursor fix
2013-12-16 07:17:35 -08:00
Mark Salsbery
1e9ea154f2
Added navigatorAutoResize option
...
Improved resizable navigator support.
2013-12-14 14:45:11 -08:00
Mark Salsbery
a189ba97d7
Update navigator on full-page/full-screen bug fix
2013-12-14 09:11:14 -08:00
Sean Wilkinson
03e82a7ca3
Corrected spelling in comments
2013-12-13 15:12:35 -06:00
Sean Wilkinson
3d1ba84c4d
Corrected simple spelling mistakes in comments
2013-12-13 15:11:00 -06:00
Mark Salsbery
14acb5d581
ABSOLUTE Control bug fix
...
Wrapped ABSOLUTE positioned controls in a div so fade opacity would work
correctly.
Added 'navigator-scroll' event addition to changelog.
2013-12-13 11:55:36 -08:00
Mark Salsbery
3deb20271a
Merge remote-tracking branch 'origin/master' into Navigator-Resize
2013-12-13 09:31:19 -08:00
Mark Salsbery
0d29c98df2
Enhanced Navigator Resizability ( #280 , #296 )
...
New navigator options:
* @property {Boolean} [showNavigator=false]
* Set to true to make the navigator minimap appear.
*
* @property {Boolean} [navigatorId=navigator-GENERATED DATE]
* The ID of a div to hold the navigator minimap.
* If an ID is specified, the navigatorPosition, navigatorSizeRatio,
navigatorMaintainSizeRatio, and navigatorTop|Left|Height|Width options
will be ignored.
* If an ID is not specified, a div element will be generated and
placed on top of the main image.
*
* @property {String} [navigatorPosition='TOP_RIGHT']
* Valid values are 'TOP_LEFT', 'TOP_RIGHT', 'BOTTOM_LEFT',
'BOTTOM_RIGHT', or 'ABSOLUTE'.<br>
* If 'ABSOLUTE' is specified, then navigatorTop|Left|Height|Width
determines the size and position of the navigator minimap in the viewer,
and navigatorSizeRatio and navigatorMaintainSizeRatio are ignored.<br>
* For 'TOP_LEFT', 'TOP_RIGHT', 'BOTTOM_LEFT', and 'BOTTOM_RIGHT',
the navigatorSizeRatio or navigatorHeight|Width values determine the
size of the navigator minimap.
*
* @property {Number} [navigatorSizeRatio=0.2]
* Ratio of navigator size to viewer size. Ignored if
navigatorHeight|Width are specified.
*
* @property {Boolean} [navigatorMaintainSizeRatio=false]
* If true, the navigator minimap is resized (using
navigatorSizeRatio) when the viewer size changes.
*
* @property {Number|String} [navigatorTop=null]
* Specifies the location of the navigator minimap (see
navigatorPosition).
*
* @property {Number|String} [navigatorLeft=null]
* Specifies the location of the navigator minimap (see
navigatorPosition).
*
* @property {Number|String} [navigatorHeight=null]
* Specifies the size of the navigator minimap (see
navigatorPosition).
* If specified, navigatorSizeRatio and navigatorMaintainSizeRatio
are ignored.
*
* @property {Number|String} [navigatorWidth=null]
* Specifies the size of the navigator minimap (see
navigatorPosition).
* If specified, navigatorSizeRatio and navigatorMaintainSizeRatio
are ignored.
Fixes #280 and #296
2013-12-13 09:23:56 -08:00
Sean Wilkinson
a5a72ee321
Set image.crossOrigin = 'Anonymous';
to avoid tainted canvas problem
2013-12-11 19:31:35 -06:00
Antoine Vandecreme
c90a1edfb5
Add layer-level-changed event and add $.indexOf polyfill
2013-12-10 19:22:15 -05:00
iangilman
06ef86dfe4
Merge pull request #304 from msalsbery/control-anchor
...
Added ControlAnchor options for default controls
2013-12-10 09:46:26 -08:00
Mark Salsbery
babfb99be9
Code fix
2013-12-09 10:04:39 -08:00
Antoine Vandecreme
0c2af6550a
Add support to add/remove layers and change their levels.
2013-12-09 09:26:36 -05:00
Mark Salsbery
6b6b7f7625
Added ControlAnchor options for default controls
2013-12-06 22:48:49 -08:00
Mark Salsbery
374d0288dd
Code cleanup
...
Removed commented and leftover code
2013-12-06 16:28:49 -08:00
Mark Salsbery
d3bcd0cec8
Better Button Fix
...
Wrapped the images in a single div and used that as the content of a
button element.
2013-12-06 16:24:52 -08:00
Mark Salsbery
e070475172
Button Tab Index Fix
2013-12-06 15:51:11 -08:00
Mark Salsbery
a6a21d21ae
Button Image Alignment Fix ( #272 , #30 )
...
Changed button element from button to div for consistent rendering
across browsers.
2013-12-06 11:22:51 -08:00
Ian Gilman
dfcb9f381e
Added missing comma in code example
2013-12-04 10:22:18 -08:00
Mark Salsbery
8319737afd
Documentation Update
2013-12-02 09:23:51 -08:00
Antoine Vandecreme
58da998d75
Add basic layers support
2013-11-30 17:28:17 -05:00
Mark Salsbery
7424bd328c
Documentation Update
2013-11-29 12:10:15 -08:00
Mark Salsbery
bb836768f8
Merged upstream changes, fixed conflicts
2013-11-26 10:21:59 -08:00
iangilman
ff32549c99
Merge pull request #292 from msalsbery/versioning
...
Added an OpenSeadragon.version property
2013-11-26 09:45:28 -08:00
Mark Salsbery
d8006e96c9
autoSize doc fixups
2013-11-25 12:10:19 -08:00
Mark Salsbery
12596b2ee5
Add jshint ignore directives to version
2013-11-25 12:02:43 -08:00
Mark Salsbery
f34fe1b6e5
Added @since doclet tag to OpenSeadragon.version
2013-11-25 11:51:36 -08:00
Mark Salsbery
2684f0ab3a
Added radix to parseInt()s
2013-11-25 10:44:34 -08:00
Mark Salsbery
7cb2f7cfd5
Updated Doclets
...
Botton fixes :)
2013-11-25 10:38:50 -08:00
Mark Salsbery
952fcca46e
Renamed noResizePolling to autoResize
2013-11-25 10:27:03 -08:00
Mark Salsbery
f0d6a5872f
OpenSeadragon.version property change
...
grunt property name changed to be more OpenSeadragon-specific
2013-11-25 09:30:49 -08:00
Mark Salsbery
2a1b797767
Modified OpenSeadragon.version property
...
Let grunt do more of the work!
2013-11-25 09:19:50 -08:00
Mark Salsbery
930e8c4dfd
Updated Doclets
2013-11-25 08:48:44 -08:00
Mark Salsbery
cb765afea2
Added an OpenSeadragon.version property
2013-11-23 10:39:37 -08:00
Mark Salsbery
190b4425ed
Renamed pollForResize to noResizePolling
...
Flipped truthiness...default of false is better for backward
compatibility
2013-11-23 08:21:08 -08:00
Mark Salsbery
c7971419e2
Added pollForResize option
...
Defaults to true.
2013-11-22 17:07:44 -08:00
Mark Salsbery
7f60184b9a
Updated Doclets
...
Found another @fires
2013-11-21 19:43:45 -08:00
Mark Salsbery
ece76925a6
Updated Doclets
...
Lots of changes, most notably event documentation (@event and @fires)
2013-11-21 12:19:07 -08:00
Mark Salsbery
b38823e390
Merged upstream changes
2013-11-20 20:39:06 -08:00
Mark Salsbery
ebb15936e1
Removed the 'onPageChange' callback ( #285 )
...
Fix for #285
Removed the 'onPageChange' callback from the viewer options.
Viewer.goToPage() now raises the 'page' event only.
2013-11-19 12:13:38 -08:00
Mark Salsbery
9065b5e1db
Merge remote-tracking branch 'origin/master' into jsdoc3-documentation
2013-11-19 11:24:54 -08:00
Mark Salsbery
f23395b60e
Updated doclets
...
Misc changes.
Committing to merge upstream changes.
2013-11-19 11:20:45 -08:00
iangilman
40dd1d276b
Merge pull request #286 from jpstroop/master
...
Support IIIF servers that don't report tile dimensions
2013-11-19 10:59:06 -08:00
Mark Salsbery
09de239bfa
Updated doclets
...
Remaining creation options - still need descriptions on some.
Started event descriptions.
Viewer constructor parameters fixed.
2013-11-19 10:08:04 -08:00
Mark Salsbery
e30b0db3aa
Merge remote-tracking branch 'origin/master' into jsdoc3-documentation
2013-11-18 11:11:24 -08:00
Mark Salsbery
3e1e5321c1
Updated doclets
...
openseadragon.js doc fixups
2013-11-18 10:30:48 -08:00
Mark Salsbery
b929f26872
Updated doclets
...
Creation options now documented in a typedef doclet named
OpenSeadragon.Options.
2013-11-18 10:06:38 -08:00
Jon Stroop
22587cec6e
use the short dimension as the tile size if IIIF server does not report tile dimensions
2013-11-18 12:51:43 -05:00
Mark Salsbery
ccee9f5149
Updated doclets
...
Updated creation option defaults (issue #93 )
2013-11-18 09:44:54 -08:00
Mark Salsbery
54049927f0
Updated doclets
...
Changed event docs:
Changed userData properties from optional to nullable.
Removed optional type from preventDefaultAction properties.
2013-11-18 06:56:32 -08:00
Mark Salsbery
70b91d57ec
Updated doclets for jsdoc3
...
Updated so jsdoc3 parser picks everything up.
Added event docs.
Lots of documentation content needed...
2013-11-15 22:19:53 -08:00
Mark Salsbery
3d2a9e4699
Removed Button href ( #274 )
2013-11-14 10:13:49 -08:00
Mark Salsbery
7b0ba31487
Cleaned up some messy javascript
2013-11-11 13:33:27 -08:00
Antoine Vandecreme
03f25cef5f
Add support to cancel full screen and full page events.
...
Fix fullpage when element has margin or padding.
2013-11-08 15:03:54 -05:00
Antoine Vandecreme
6aca0c0886
Add counter to avoid trying to set scroll indefinitly
...
Style and spelling fixes
Set scrolls tests setup inside own function
2013-11-08 13:56:13 -05:00
Antoine Vandecreme
fafc985ada
Merge branch 'master' of https://github.com/openseadragon/openseadragon into fullscreen
2013-11-08 13:40:04 -05:00
Ian Gilman
df80d2e572
Merge branch 'MouseTracker-preventDefaultAction' of github.com:msalsbery/openseadragon into msalsbery-MouseTracker-preventDefaultAction
...
fixed Conflicts:
changelog.txt
2013-11-08 10:04:22 -08:00
Mark Salsbery
5c4131303a
Use canvas when available - Fixes
...
Removed redundant useCanvas property from drawer
2013-11-07 11:48:01 -08:00
Mark Salsbery
8e325a3748
Added preventDefaultAction flag to MouseTracker
...
Added a boolean preventDefaultAction property (default false) to the
event object passed to MouseTracker handler methods. Implemented in the
following MouseTracker subscribers:
* Viewer.keyboardCommandArea.innerTracker.focusHandler:
preventDefaultAction == true prevents scrolling viewer into view
* Viewer.keyboardCommandArea.innerTracker.keyHandler:
preventDefaultAction == true prevents viewer keyboard navigation
* Viewer.innerTracker.clickHandler: preventDefaultAction == true
prevents viewer zoom on click
* Viewer.innerTracker.dragHandler: preventDefaultAction == true prevents
viewer panning with mouse/touch
* Viewer.innerTracker.scrollHandler: preventDefaultAction == true
prevents viewer zooming on mousewheel/pinch
2013-11-04 12:41:45 -08:00
Antoine Vandecreme
d70845d7eb
Separate fullscreen and fullpage methods ( #91 )
...
Fix scroll issue.
Handle fullscreen denial by the browser
2013-11-02 21:01:04 -04:00
Antoine Vandecreme
d853224c15
Add units tests for scroll
2013-11-01 17:37:19 -04:00
Mark Salsbery
085c7f2ecb
Use canvas when available - Fixes
...
Updated documentation doclet.
Enclosed detection code in a function.
Eliminated the Drawer USE_CANVAS global and replaced it with a
Drawer.useCanvas instance variable.
2013-11-01 13:02:28 -07:00
Mark Salsbery
85fcf0ec11
Merge remote-tracking branch 'origin/master' into canvas-detect
...
Conflicts:
src/openseadragon.js
2013-11-01 12:22:48 -07:00
iangilman
047129e817
Merge pull request #262 from avandecreme/mousestop
...
Add mouse stop event
2013-11-01 11:14:57 -07:00
Mark Salsbery
e209846ac1
Use canvas whenever possible ( #191 )
...
Drawer uses an HTML5 canvas element if it's available.
Viewer.useCanvas can be used to override (default is true).
2013-11-01 10:19:47 -07:00
Antoine Vandecreme
7375ba9241
Fix scrolling when exiting full-screen mode.
...
Rename fullpage event to full-page and it's fullpage property to fullPage.
Add pre-full-page event.
2013-10-31 22:19:22 -04:00
Antoine Vandecreme
3f5db8f8de
Fix mousestop event on IE
2013-10-31 16:16:08 -04:00
Mark Salsbery
bbedbd29cb
Merged changes from master
2013-10-31 11:27:13 -07:00
Antoine Vandecreme
542d5f5aeb
Remove cancelEvent + fix typos
2013-10-30 21:28:10 -04:00
Mark Salsbery
9e5dcd766f
Punctuation fix
2013-10-30 13:35:39 -07:00
Mark Salsbery
cfd76a6fd9
Whitespace fix
2013-10-28 12:38:17 -07:00
Mark Salsbery
d6b187eb06
Fix for non-canvas tile rendering at large size
...
In USE_CANVAS==false mode, wrapped tile img elements in div elements to
allow them to be rendered larger than their containing element without
being stretched.
2013-10-28 12:36:29 -07:00
Mark Salsbery
0f8ac4cfab
Added 'MozMousePixelScroll' event handling
...
For older Firefox versions
2013-10-24 13:39:00 -07:00
Mark Salsbery
755c4752c0
'wheel' Event Support Fixes
...
Whitespace, cancel handling
2013-10-23 13:55:52 -07:00
Mark Salsbery
e76c9e65ab
Added 'wheel' Event Support
...
Also improved OpenSeadragon.addEvent()/OpenSeadragon.removeEvent()
2013-10-23 12:58:36 -07:00
Antoine Vandecreme
d4a4276bbc
Fix margin bug with legacy fullscreen mode
2013-10-23 10:00:08 -04:00
Antoine Vandecreme
8debb26d61
Add mouse stop event
2013-10-22 16:54:04 -04:00
iangilman
c9f60fd468
Merge pull request #218 from gwills/master
...
IE 10 not reading DZI file correctly
2013-10-22 10:35:05 -07:00
iangilman
5d45054fee
Merge pull request #257 from msalsbery/EventSource-Original-Events
...
originalEvent Pass through to EventSource events (#227 )
2013-10-22 10:31:18 -07:00
gwills
3777b53507
Revert "Fix rotate on rectangular overalys"
...
This reverts commit a70d082be3
.
2013-10-22 13:54:32 +01:00
Antoine Vandecreme
54d02ada78
Replace viewport.getImageZoomRatio by conversion methods between viewport zoom and image zoom
2013-10-18 15:16:49 -04:00
Mark Salsbery
984dd267b6
originalEvent Pass through to EventSource events
2013-10-15 11:11:08 -07:00
Antoine Vandecreme
f712e15793
Recenter the image after switching fullscreen mode. #62 and #170
2013-10-14 18:01:58 -04:00
gwills
a70d082be3
Fix rotate on rectangular overalys
...
Use size after rotate when positioning the overlay.
Also removed check on this.scales - was there a reason these were not
handled when rotating? If so we can add a option here maybe.
2013-10-14 10:59:20 +01:00
Antoine Vandecreme
4cd98a5da9
Check hash in viewer constructor.
...
Fix #229
Fix #176
2013-10-12 18:30:05 -04:00
iangilman
e006d0e05a
Merge pull request #254 from msalsbery/Event-Handler-Signatures
...
Event Handler Signatures Changed to 'fn(event)' (#251 )
2013-10-11 10:57:20 -07:00
Mark Salsbery
f9fb80b4d2
referencestrip.js spacing fix
2013-10-11 10:50:50 -07:00
Mark Salsbery
f5750bb9f6
referencestrip.js event handler cleanup
2013-10-11 10:44:03 -07:00
iangilman
e89562c03a
Merge pull request #252 from Sharpbarb/master
...
Add the ability to create a viewer and start at a specified page
2013-10-11 09:57:28 -07:00
Mark Salsbery
d574700b3d
Event Handler Signatures Changed to 'fn(event)'
...
All event handler signatures changed to 'fn(event)'
eventSource property added to the event object passed
Redundant event source properties removed ('button' and 'viewer'
Documentation updated in MouseTracker
changelog.txt updated
2013-10-10 17:00:15 -07:00
Sharpbarb
3078642927
Update viewer.js
...
Moved call to _updateSequenceButtons inside if ( initialTileSource )
2013-10-10 12:57:02 -07:00
Sharpbarb
4535f47e8d
Update viewer.js
...
trailing whitespace...
2013-10-10 12:35:49 -07:00
Sharpbarb
6b90687ab4
Update viewer.js
...
description; Move _updateSequenceButtons behind goToPage()
2013-10-10 12:27:49 -07:00
Sharpbarb
a862870883
Update viewer.js
...
Formatting; descriptions; rename sequenceButtons to _updateSequenceButtons
2013-10-10 12:25:11 -07:00
Sharpbarb
7aac7ffd9c
Update openseadragon.js
...
Align initialPage value
2013-10-10 12:05:05 -07:00
iangilman
9050a39387
Merge pull request #243 from avandecreme/master
...
Add coordinates conversion methods to viewport.
2013-10-10 10:38:09 -07:00
Sharpbarb
6f79f80fe0
Update viewer.js
...
trailing white space....
2013-10-09 15:36:21 -07:00
Sharpbarb
0f705d093a
Update viewer.js
2013-10-09 15:31:33 -07:00
Sharpbarb
0d8d770327
Update viewer.js
2013-10-09 15:27:43 -07:00
Sharpbarb
81664251cc
Update openseadragon.js
...
Missing colon
2013-10-09 15:22:36 -07:00
Sharpbarb
2f33e6c666
Update viewer.js
2013-10-08 21:45:26 -07:00
Sharpbarb
c6597806ba
Update viewer.js
2013-10-08 17:10:26 -07:00
Sharpbarb
54bcd6ea79
Update viewer.js
...
Remove the sequence control update and put it into its own function. This way it can be called after a tilesource is loaded.
2013-10-08 17:07:49 -07:00
Sharpbarb
ec71a4416e
Update viewer.js
2013-10-08 15:01:28 -07:00
Sharpbarb
fc972df52e
Update openseadragon.js
2013-10-08 14:53:08 -07:00
iangilman
7d8fb803ef
Merge pull request #244 from msalsbery/Pinch-Zoom-Fix
...
Pinch zoom fix
2013-10-08 10:23:10 -07:00
iangilman
45ee8236e3
Merge pull request #247 from jmnetus/master
...
Check that zoom reference point is valid before using it
2013-10-08 10:17:29 -07:00
Mark Salsbery
1c17ea8afa
Merge branch 'master' into Pinch-Zoom-Fix
...
Conflicts:
changelog.txt
2013-10-07 08:44:29 -07:00
Mark Salsbery
a9cf3f2904
Merge branch 'master' into Button-Event-Signatures
2013-10-07 08:38:08 -07:00
Jon Stroop
964e73b9a5
iiiftilesource now uses pixel-based syntax 'w,'. level 1 compliance it still required, so backward compatability should not be an issue
2013-10-05 15:02:26 -04:00
Antoine Vandecreme
3e5a9b52c9
Rollback basic.html and create coordinates.html.
...
Fix unit tests.
Fix documentation.
2013-10-05 10:21:12 -04:00
Jonathan Nielsen
c5ac5b6550
whitespace formatting change
2013-10-04 13:09:58 -06:00
Jonathan Nielsen
ae5acb6547
Add similar refPoint validity check to zoomBy
2013-10-04 13:06:25 -06:00
Jonathan Nielsen
fd85ee4f4e
Check that zoom reference point is valid before using it
2013-10-04 10:12:47 -06:00
Mark Salsbery
dde06bf416
Merge branch 'master' into Button-Event-Signatures
2013-10-03 19:50:57 -07:00
Mark Salsbery
2f31395fc0
Merge remote-tracking branch 'origin/Touch-Bug-Fix'
2013-10-03 17:07:28 -07:00
iangilman
d88ce4a970
Merge pull request #242 from msalsbery/Touch-Bug-Fix
...
Fix for touch event issue #240
2013-10-03 16:30:15 -07:00
Mark Salsbery
d55b2e7703
Pinch zoom fix
...
The existing code failed on iPhone Safari iOS 6.x - event.detail was
always 0 causing only zoom out behavior.
2013-10-03 15:30:40 -07:00
Antoine Vandecreme
791ecfae75
Add coordinates conversion methods to viewport.
2013-10-03 17:27:11 -04:00
Mark Salsbery
9928a6d925
Fix for touch event issue #240
2013-10-03 12:11:33 -07:00
Mark Salsbery
76733c4ca2
Button event signatures fixed for consistency
...
Button event signatures now "handlerMethod(eventSource, eventData)"
where eventData == { button }
2013-10-03 09:29:20 -07:00
Mark Salsbery
5c37a1f375
Ready event signature fixed for consistency
...
Signature now handlerMethod(eventSource, eventData)
2013-10-02 13:09:40 -07:00
Mark Salsbery
d8fc7d10f9
Merge branch 'master' into Event-Names-Normalize
2013-10-01 15:12:00 -07:00
Jon Stroop
e4bd874b03
added test for 1.1; renamed 11 to 1_1
2013-10-01 15:07:44 -07:00
Jon Stroop
1a52656ed6
supports IIIF 1.1 syntax
2013-10-01 15:07:43 -07:00
Jon Stroop
890ec0c848
fixed size param
2013-10-01 15:07:42 -07:00
Jon Stroop
bccbf5ecf1
configureFromObject uses @id
2013-10-01 15:07:42 -07:00
Jon Stroop
e3c1007ae2
use pixels for size instead of pct
2013-10-01 15:07:41 -07:00
Jon Stroop
434807a660
added support for iiif 1.1
2013-10-01 15:07:41 -07:00
Mark Salsbery
ec3141a778
Event Names Normalized
...
Compound event names lower case with hyphen.
Button event names removed "on" and made lower case.
2013-09-30 10:22:06 -07:00
Mark Salsbery
c0a16dacc4
eventsource.js comment fix
2013-09-26 10:23:00 -07:00
Mark Salsbery
bf0608b4b2
string.js quotes/whitespace fix
2013-09-26 10:16:10 -07:00
Mark Salsbery
041597998f
Event Names Normalized
...
All event names lower case with no hyphens
2013-09-26 09:50:26 -07:00
iangilman
21aa2dc928
Merge pull request #228 from msalsbery/EventHandler-Rename
...
Renamed EventHandler to EventSource (#225 )
2013-09-25 09:04:04 -07:00
gwills
f8a0315757
Small formatting change
...
Needed to change spacing to pass through jshint
2013-09-24 21:54:54 +01:00
gwills
8f2999da29
Use $.parseXml for parsing string as XML
2013-09-24 21:49:54 +01:00
Mark Salsbery
dab182757d
Renamed EventHandler to EventSource ( #225 )
2013-09-24 13:36:13 -07:00
Ian Gilman
6396fe1504
Merge branch 'Original-Events-In-Handlers' of github.com:msalsbery/openseadragon into msalsbery-Original-Events-In-Handlers
...
Fixed Conflicts:
changelog.txt
2013-09-24 10:28:46 -07:00
Mark Salsbery
c27481546a
MouseTracker Original Events in Handlers
...
Whitespace fixes on un-empty [] brackets
2013-09-20 09:58:18 -07:00
Mark Salsbery
56ef12e850
Original Events in Handlers
...
Documentation fixes
isTouchEvent property removed from eventData where not used
'eventOrTouchPoint' var name used and 'originalEvent' var name restored
to 'event'
2013-09-12 10:05:50 -07:00
Nelson Hart
6d6cc363b4
Use style attributes when storing the previous elment size instead of the literal size of the element #220
2013-09-12 10:41:51 -03:00
Mark Salsbery
af078f8f19
MouseTracker Original Events in Handlers
...
Renamed insideElementRelease to insideElementReleased.
2013-09-10 17:31:51 -07:00
Mark Salsbery
1dc2d7e011
MouseTracker Original Events in Handlers
...
Touch events bug fix. Now uses touch object(s) properly when calculating
positions.
2013-09-10 17:23:19 -07:00
Mark Salsbery
13415b36f3
MouseTracker Original Events in Handlers
...
Misc name changes, indentation/whitespace fixes.
Still TODO: Fix documentation, evaluate presence of key handler in a
mouse tracker, evaluate whether isTouchEvent flag should be in all
eventData objects or not.
2013-09-09 14:27:58 -07:00
gwills
2bef2e882f
IE 10 not reading DZI file correctly
...
IE 10 is treating the data coming back from the JSONP request as a
string and not as XML. I have confirmed this issue is happening on
numerous IE10 machines but have not seen it on any other browser.
The change simply checks the type of the data variable and if it is a
string it parses the string as XML and updates the data object.
2013-09-07 17:08:39 +01:00
Mark Salsbery
d60224b615
MouseTracker Original Events in Handlers
...
Pass original touch events to handlers.
2013-09-06 13:12:11 -07:00
Mark Salsbery
2e1f71a824
MouseTracker Original Events in Handlers
...
Bug fixes. Event handler methods shouldn't be called directly in
theory...
2013-09-06 12:24:19 -07:00
Mark Salsbery
8229a9aba5
MouseTracker Original Events in Handlers
...
More formatting fixes
2013-09-06 11:20:14 -07:00
Mark Salsbery
5f6b89b8b5
MouseTracker Original Events in Handlers
...
More formatting fixes
2013-09-06 11:10:05 -07:00
Mark Salsbery
56f5b9fb74
MouseTracker Original Events in handlers
...
Comment & Formatting fixes
2013-09-06 10:43:39 -07:00
Mark Salsbery
b3fa8f1184
MouseTracker original events in handlers
...
Implemented "Expose original event in handlers" (#23 ) for MouseTracker
Added OpenSeadragon.getElementOffset() method. Element-relative mouse
coordinates should be correct even if the element and/or page is
scrolled (#131 )
2013-09-05 17:20:17 -07:00
Ian Gilman
75ddd299e4
Changed Seajax to OpenSeadragon
2013-09-05 16:26:00 -07:00
Antoine Vandecreme
63af5a69ac
Add comments and fix indentation
2013-09-04 14:13:25 -04:00
Antoine Vandecreme
bfa76e471b
Add viewportToImageRectangle method and add support to pass a point to viewportToImageCoordinates and imageToViewportCoordinates
2013-08-30 13:59:48 -04:00
iangilman
b2ecdcdc2a
Merge pull request #208 from acdha/ie8-ajax-error-handler-fix
...
Fix AJAX error reporting on IE8
2013-08-30 09:52:11 -07:00
Chris Adams
baa3559df1
Graceful handling of cross-domain tilesource failures on IE<10
...
The TileSource error handling path used to raise non-obvious
"Unspecified error" exceptions on IE < 10 when configured with a URL
from a different origin (hostname or port) because the handler included
``xhr.status`` in the error message, triggering a security exception.
Now the second exception is caught and the log message will use the
original exception message instead to make the root cause more obvious.
2013-08-30 12:32:17 -04:00
Chris Adams
1b6cf93474
Graceful handling of IE cross-domain AJAX failures
...
Prior to IE 10, XmlHttpRequest cannot be used for requests to a
different origin even when the target URL's CORS headers would allow
access (see http://caniuse.com/#feat=cors ).
This is easy to miss in testing if you use a single origin during
testing but have a CDN or domain-sharding for production and will break
the error handler function passed to makeAjaxRequest() if that code
assumes it can access properties on the request object.
This adds a more informative pointer to Microsoft's documentation when a
security exception is raised.
2013-08-29 16:13:18 -04:00
Mark Salsbery
c7f184f199
Reverted breaking change for issue #201
...
To be grouped with other breaking changes for major version release.
Also, minor formatting fix in src/eventhandler.js
2013-08-27 10:10:55 -07:00
Mark Salsbery
57ae0656c1
Fixes for issues #198 , #201 , #202 , #203
2013-08-26 16:48:59 -07:00
Mark Salsbery
f8ab315795
Revert "Bad sync"
...
This reverts commit 70a7e8090e13cc35b93e652d2bcd7f418af26fc1.
2013-08-26 15:48:03 -07:00
Mark Salsbery
04a0197dc7
Fixes for issues #198 , #201 , #202 , and #203
2013-08-26 15:25:57 -07:00
iangilman
aefe7f3610
Merge pull request #185 from robhobbes/master
...
Adding partial support for rotation.
2013-08-20 11:08:58 -07:00
Robert Hickman
d4467477ad
More rotation documentation.
2013-08-19 16:29:22 -06:00
Ian Gilman
4b0450d271
Documented "current" param to a number of viewport functions
2013-08-19 10:14:04 -07:00
iangilman
d2353746c9
Merge pull request #179 from lukemurray/destroy
...
Add a destroy function on the viewer to clean up and remove elements
2013-08-19 10:03:12 -07:00
iangilman
dde052a22a
Merge pull request #188 from iangilman/touch
...
Ignoring touchMove if we didn't get the touchStart
2013-08-19 09:57:36 -07:00
iangilman
e955c402ac
Merge pull request #187 from iangilman/rtl
...
Drawer now works when the page is rtl
2013-08-19 09:55:04 -07:00
Robert Hickman
767c897e7f
Revisions to rotate after second code review.
2013-08-16 11:32:21 -06:00
Ian Gilman
96c14f7617
Ignoring touchMove if we didn't get the touchStart
2013-08-16 10:09:49 -07:00
Robert Hickman
54e8d8c43f
Fixes made after first code review of rotation.
2013-08-15 16:15:20 -06:00
Ian Gilman
6669589e5e
Drawer now works when the page is rtl
2013-08-15 12:54:32 -07:00
Robert Hickman
6c63710131
Rotating overlays.
2013-08-14 13:43:49 -06:00
Ian Gilman
adbf35e002
Merge branch 'master' into form
2013-08-14 10:41:32 -07:00
Ian Gilman
3272572124
Clicking on a button control no longer refreshes page
2013-08-14 10:39:39 -07:00
Robert Hickman
b9583c43ac
Working on rotating images.
...
So far only 90 degree rotation is supported.
Only the image is currently being rotated.
Overlays, debugger, and the navigator still need to be updated to support rotation.
2013-08-13 16:32:04 -06:00
Luke Murray
ab82783cf1
update the comments and unit test
2013-08-13 10:33:12 +10:00
Luke Murray
0c662b8a8d
fix: comment updates and add a simple test for viewer.destroy
2013-08-12 16:38:37 +10:00
Luke Murray
68f9d675fc
fix: calling viewer.destroy() multiple times throw an error. And a simple destroy to mousetracker
2013-08-08 17:49:24 +10:00
thatcher
88141c57f2
feature: navigatorPosition, option was available but not completely implemented
2013-08-08 00:12:44 -04:00
Luke Murray
4ccb141a42
Add a destroy function on the viewer to clean up and remove elements
...
created by open seadragon. Add removeAllHandlersForAllEvents to clean up all events on destroy. Clear
the onDraw callback on Overlay destroy.
2013-08-07 10:54:20 +10:00
Ian Gilman
967f2e4f32
Changelog for #177 ; minor doc tweaks
2013-08-02 09:40:55 -07:00
iangilman
51e37e3553
Merge pull request #177 from pnorcross/_getSafeElemSize
...
(hopefully) Final fix for issue #109 , Viewport Broken on Hide.
2013-08-02 09:36:06 -07:00
pnorcrss
26938ed10e
cleaned up docBlock and tabs in _getSafeElemWidth()
2013-08-01 12:11:33 -05:00
iangilman
f53ea2ddf1
Merge pull request #160 from lukemurray/custom_zoom_handler
...
Add the option for a zoom handler callback
2013-08-01 09:52:11 -07:00
Luke Murray
2717398181
Use the correct onDraw in drawer.js. Remove imageFullSize and fix up the comment for onDraw
2013-08-01 13:36:00 +10:00
pnorcrss
e47210d0bd
refactored _getSafeElemSize()
2013-07-31 14:10:44 -05:00
pnorcrss
cb39fb7e32
fixed _getSafeElemSize()
2013-07-31 14:01:46 -05:00
pnorcrss
bf3dd7c031
fixed _getSafeElemSize() calls
2013-07-31 13:28:38 -05:00
pnorcrss
750eafcd2e
added and implemented _getSafeElemSize()
2013-07-31 13:00:16 -05:00
iangilman
0aa0641cf4
Merge pull request #168 from ethanli83/fixtouch
...
canvas pans when tap on touch screen
2013-07-31 10:25:19 -07:00
Luke Murray
4239bb7adc
fix: remove the useTransform/SVG stuff and move back to a simple onDraw callback only so people can handle their own custom drawing and sizing
2013-07-31 17:01:48 +10:00
Luke Murray
0a8d11875e
Merge branch 'master' into custom_zoom_handler
2013-07-31 16:39:54 +10:00
ethan.li
0bb9c5be97
issue:
...
canvas pans when tap on touch screen
reason:
onTouchStart calls onMouseDown which registers 'mousemove' event handler.
when I tap on touch screen, even though browser did not dispatch 'touchmove' event, it dispatched 'mousemove' event.
therefore, the 'mousemove' handler pans canvas.
fix:
stop onTouchStart handler registering 'mousemove' handler as onMouseMove will be properly triggered by onTouchMove
2013-07-23 16:40:04 +10:00
Luke Murray
df877493a9
Rename drawHandler to onDraw. Also make it a notification style callback
...
(does not override the draw functionality).
Add an overlay option 'useTransform' that will transform the overlay
element instead of moving it's postion - useful for SVG elements
2013-07-16 12:04:37 +10:00
iangilman
77cf2a3b88
Merge pull request #159 from ethanli83/master
...
Fix for onTouchEnd
2013-07-12 09:01:31 -07:00
Luke Murray
233c3a357a
Add the option for a zoom handler callback
2013-07-12 16:51:56 +10:00
ethan.li
0ef98be0b7
for fix I made to onTouchEnd:
...
1. remove IE8 related code as it does not support touch anyway
2. use event.changedTouches [ 0 ] rather than event
2013-07-12 10:29:44 +10:00
Ian Gilman
7391561dcd
OpenSeadragon.now() returned undefined the first time; fixed
2013-07-10 09:31:22 -07:00
ethan.li
8108009ba7
fix issue:
...
onTouchEnd did not call the correct mouse up handler
2013-07-09 11:07:18 +10:00
iangilman
850aa14802
Merge pull request #151 from acdha/overhauled-ajax-error-reporting
...
Overhauled AJAX error reporting
2013-07-03 09:56:07 -07:00
radix-pro
004f13365d
Update iiiftilesource.js
2013-07-02 13:41:37 -07:00
radix-pro
3c7e4b794a
Update iiiftilesource.js
2013-07-02 00:41:22 -07:00
radix-pro
8f8e028015
Update iiiftilesource.js
2013-07-02 00:34:23 -07:00
radix-pro
acd55c709d
Update iiiftilesource.js
2013-07-02 00:27:53 -07:00
radix-pro
040ff3a7ae
Update iiiftilesource.js
2013-07-02 00:18:37 -07:00
radix-pro
a4303fb232
Update iiiftilesource.js
2013-07-02 00:02:48 -07:00
radix-pro
0441cfe4ec
Update iiiftilesource.js
2013-07-01 23:55:07 -07:00
radix-pro
44a9d1b98b
Update iiiftilesource.js
2013-07-01 23:49:25 -07:00
radix-pro
dde42b641d
Update iiiftilesource.js
...
Fix Issue #55 "Tiles rendering issue..."
2013-07-01 22:38:37 -07:00
Chris Adams
0ed4703bd3
Viewport messages: add a class to the dialog for easy styling
2013-07-01 18:26:44 -04:00
Chris Adams
1ab6094420
Viewer: make viewport messages private, repeatable
...
* Marked _showMessage/_hideMessage as private
* Fix DOM manipulation bug: call standard removeNode() method rather
than proprietary WebKit .remove()
* Change messageDiv to be the outer wrapper to simplify removing the
entire message container
2013-07-01 13:43:48 -04:00
Chris Adams
b912896158
Viewer.showMessage() hides any previous message
2013-07-01 12:58:22 -04:00
Chris Adams
9de45ba281
Refactor OpenSeadragon.makeCenteredNode
...
* Use CSS display tables for vertical centering (tested back to IE8)
* Use the DOM instead of string concatenation
* Remove redundant styles ($.makeNeutralElement sets the same values
for margin, padding & border)
* Return the outer wrapper element to ease DOM addition & removal
2013-06-28 15:52:48 -04:00
Chris Adams
1f345e4cc5
Viewer: refactor message code into showMessage/hideMessage methods
...
This avoids the need to deal with classes, and explicitly makes it
reusable for other needs
2013-06-28 15:46:31 -04:00
Chris Adams
7f42dfc032
code style
2013-06-28 15:01:56 -04:00
Chris Adams
fb7c91acd2
code style
2013-06-28 14:54:44 -04:00
Chris Adams
7dcf662fdd
Viewer: add a basic error message display system
...
This might be something we want to make configurable for users who want
to completely control how errors are displayed.
This also adds the first use of OpenSeadragon.makeCenteredNode currently
so we might want to clean up that code as well.
2013-06-28 14:32:57 -04:00
Chris Adams
2bf6b13bfe
User-visible warning when tile sources fail to load
...
This is currently using window.alert in lieu of something more sophisticated but it works for indicating 404s or invalid file
contents
2013-06-28 14:11:20 -04:00
Chris Adams
494bf7fe41
strings: add logging for untranslated source messages
...
This should probably be changed to be closer to the goal of being
like gettext but we can at least tell developers when we clobber the
string
2013-06-28 14:11:19 -04:00
Chris Adams
464428cef7
makeAjaxRequest: don't set request to null
...
Setting onreadystatechange can avoid the possibility of it somehow being
called twice but there's no point in nulling the request right before we
let the GC collect it.
2013-06-28 14:00:02 -04:00
Chris Adams
db38b71dd9
makeAjaxRequest: throw error for missing callback
2013-06-27 16:03:43 -04:00
Chris Adams
1c6a57c710
makeAjaxRequest: log all errors, test callback
...
* All AJAX errors will log to the console
* The onError callback will only be called if defined
2013-06-27 16:03:41 -04:00
Chris Adams
5eccdfee98
Better match project style
2013-06-27 15:58:09 -04:00
Chris Adams
496b7d757b
Simplify OpenSeadragon.makeAjaxRequest
...
* Since async is always true – and browsers are starting to deprecate
synchronous XHR – we were able to prune considerable amount of code
* Add an error callback to match the existing success callback
2013-06-27 15:58:09 -04:00
iangilman
8fe0ce26b8
Merge pull request #136 from acdha/jshint-cleanup
...
JSHint tidying
2013-06-26 09:37:08 -07:00
iangilman
f4139cef38
Merge pull request #144 from acdha/143-xhr-error-handling
...
Safe cleanup in makeAjaxRequest error handler
2013-06-26 09:23:04 -07:00
Ian Gilman
3f1072b321
Fixed typos in comments
2013-06-26 09:15:37 -07:00
Chris Adams
c648c1df8a
drawer: don't leak drawLevel into global namespace
...
This code is still under-tested and documented but no longer relies on
`drawLevel` being leaked into the global namespace where `updateLevel`
to find it.
See #145
2013-06-25 14:26:09 -04:00
Chris Adams
f2cba16a8b
Safe cleanup in makeAjaxRequest error handler
...
Previously `request.onreadystatechange` was assigned an empty function
on success but null on failures, which breaks in IE (see
http://jsbin.com/ezozax/6/ ).
This patch simply mimics the success behaviour in the cleanup function
Closes #143
2013-06-25 14:13:45 -04:00
Benjamin 'blindCoder' Schieder
0150622e78
fix error when recalculating overlay width and height
2013-06-25 18:01:38 +02:00
Chris Adams
c2107fcb22
Declare _processDZIError directly on OpenSeadragon
2013-06-21 16:37:31 -04:00
Kevin Ewing
8896c2278d
Fixed mistake
2013-06-20 13:31:04 -07:00
Kevin Ewing
2ba3acda38
Removed extra parens
2013-06-20 13:23:16 -07:00
Kevin Ewing
248852c15f
Implementing OpenSeadragon.now()
...
Replacing both `+new Date()` and `new Date().getTime()` with `$.now()`
2013-06-20 13:15:04 -07:00
Chris Adams
9ef6e085c8
viewer.js: update onfullscreenchange handler comment
2013-06-20 15:17:48 -04:00
Chris Adams
de29a34890
viewer.js: remove dead code
2013-06-20 15:12:55 -04:00
Chris Adams
adc4147304
Expose semi-private processDZIError for use by DziTileSource
...
This previously wasn't in scope outside of the main OpenSeadragon
closure. Now it's exposed with an underscore prefix to encourage people
not to think of it as a public interface.
2013-06-20 15:12:54 -04:00
Chris Adams
51bb8ca46e
openseadragon.js: fix imageFormatSupported refs
2013-06-20 15:12:54 -04:00
Chris Adams
169244ed1a
navigator.js: omit unused borderWidth from func args
2013-06-20 15:12:54 -04:00
Chris Adams
0d09183159
referencestrip.js: move variable declaration to the top of loadPanels
2013-06-20 15:12:54 -04:00
Chris Adams
eafc822aa8
openseadragon.js: remove unused builtin aliases
2013-06-20 15:12:54 -04:00
Chris Adams
8c433ba81c
Declare assumed globals
2013-06-20 15:12:54 -04:00
Chris Adams
e2bea810e3
Replace gnarly ternary expression with if statement
2013-06-20 15:12:53 -04:00
Chris Adams
64d94ac2bd
referencestrip.js: declare undeclared variable
2013-06-20 15:12:53 -04:00
Chris Adams
f8c77f65d7
viewer.js: fix typos in variable declarations
2013-06-20 15:12:53 -04:00
Chris Adams
d644acd50b
Fix lack of braces on if statements
...
JavaScript's most popular rack in the grass for maintenance coders…
2013-06-20 15:12:53 -04:00
Chris Adams
643ee211ca
Remove unused variables
...
Mostly unused function arguments but there were also a fair number
of legacy names which are now no longer used.
One question which comes up – mostly in tilesource.js – is whether
there is any value in leaving unused variables for functions which
are intended to be overridden anyway. I'm inclined to say that the
docs + tests need to be sufficient as there's no enforcement that
whatever is in the base implementation will actually be followed by
any of the real functions.
2013-06-20 15:12:53 -04:00
iangilman
6e9a300d1a
Merge pull request #133 from iangilman/raf
...
Improved requestAnimationFrame polyfill; fixed timer leaks; added tests
2013-06-20 09:52:10 -07:00
Kevin Ewing
0984106983
Added missing semicolon
2013-06-20 09:08:21 -07:00
Kevin Ewing
2f8a26fda0
Responding to feedback
...
Function now re-assigns itself on the first go round to avoid doing the
check every time it is called
2013-06-19 15:13:56 -07:00
Ian Gilman
e0282a3c86
Stripped whitespace
2013-06-19 13:33:01 -07:00
Kevin Ewing
ebffea5a34
Merge branch 'master' into now
2013-06-19 11:23:42 -07:00
Ian Gilman
8e88f36098
Merge branch 'master' into raf
...
Fixed Conflicts:
src/viewer.js
2013-06-19 11:19:54 -07:00
Kevin Ewing
e8408c1313
Moved to better location
2013-06-19 11:16:45 -07:00
Kevin Ewing
6a3b7cfb2f
Added OpenSeadragon.now()
2013-06-19 10:57:09 -07:00
Chris Adams
9f6f164d9f
Remove all whitespace
...
The results of running this command::
find . -name \*.js -print0 | xargs -0 perl -p -i -e "s|[ \t]+$||"
(Split from #136 )
2013-06-19 13:33:27 -04:00
Ian Gilman
beadcdcc89
Merge branch 'master' into raf
2013-06-19 10:15:53 -07:00
iangilman
c14467afa4
Merge pull request #135 from robhobbes/master
...
Only disable the previous button if the navPrevNextWrap option is not set
2013-06-19 10:12:38 -07:00
Ian Gilman
4022206261
Removed the parens around new Date call, for consistency
2013-06-19 10:03:44 -07:00
Ian Gilman
2e48239056
Addressing code review comments
2013-06-19 09:58:22 -07:00
Ian Gilman
dbc8a59ae8
Cleaned out dead code in scheduleUpdate and updateMulti
...
… as pointed out by @ventero
2013-06-19 09:58:09 -07:00
Robert Hickman
ade93ffc5e
Only disable the previous button if the navPrevNextWrap option is not set.
2013-06-18 15:19:09 -06:00
Ian Gilman
713fad4224
Exposing _updateRequestId as a semi-private member for testing purposes
2013-06-18 11:06:43 -07:00
Ian Gilman
e99c126a85
Navigator now updates properly when reopening a viewer
...
Before, if you closed a viewer and then opened a new tilesource into
it, the navigator would still have the old tilesource. This patch fixes
that.
2013-06-17 11:51:02 -07:00
Ian Gilman
c6a38dd802
Now closing the navigator when the viewer closes
...
At the very least this was causing the navigator to continue to request
and process frames even after its viewer had been closed.
2013-06-17 11:31:41 -07:00
Ian Gilman
4224960252
Fixed another potential timer leak when closing a viewer
...
If the viewer was closed in response to an event raised during the
update function, the timer would have continued running.
2013-06-17 11:30:31 -07:00
Ian Gilman
0112f6a4ea
Improved requestAnimationFrame polyfill
...
Processes all outstanding frame requests per frame, rather than one at
a time.
2013-06-17 11:28:42 -07:00
Ventero
0093153e4e
Simplify setting element opacity.
...
This simplifies setElementOpacity by removing support for the
obsolete, IE-only element.filters property. Also removes a variable
that previously leaked into the global scope.
2013-06-13 19:09:47 +02:00
Ian Gilman
300167bcf1
Merge branch 'master' into ratio
2013-06-13 09:41:01 -07:00
iangilman
f412d07237
Merge pull request #121 from houseofyin/issue37-navigator
...
Issue37 navigator / Issue101 navigator follow-up / Issue102 navigator default
2013-06-13 09:39:27 -07:00
houseofyin
e9587808ec
Tweaked how the deprecated API element has handled
2013-06-11 14:35:45 -04:00
houseofyin
8a3ec97596
Implemented and documented fallback behavior
2013-06-07 10:24:12 -04:00
Ventero
a18f0e0efb
Improve performance of Tile#drawHTML.
...
By specifying the tile size in absolute pixel values instead of
percentages, we can save the call to $.getElementSize.
2013-06-03 20:09:42 +02:00
houseofyin
7a8ebd7d4c
More reasonable handling of the navigator when interacting outside the bounds of the display region
2013-06-02 22:32:29 -04:00
houseofyin
dc7bc6920c
Updating the documentation
2013-06-01 16:09:04 -04:00
houseofyin
3e24be12e0
Merge branch 'master' of github.com:openseadragon/openseadragon into issue37-navigator
2013-06-01 14:12:04 -04:00
houseofyin
e36f7ed414
Trying to remove the selector element
2013-06-01 14:11:56 -04:00
Ian Gilman
83060156a6
Merge branch 'master' into ratio
2013-05-31 09:18:25 -07:00
Ian Gilman
9c60b28ec3
Merge branch 'master' of github.com:robhobbes/openseadragon into robhobbes-master
...
Fixed Conflicts:
changelog.txt
2013-05-31 09:01:14 -07:00
Robert Hickman
699a5dd101
Adding documentation about navPrevNextWrap.
2013-05-30 12:46:54 -06:00
Ian Gilman
b34f460fb0
Reverting minPixelRatio to 0.5 for better quality
2013-05-30 10:07:34 -07:00
iangilman
b754ea834f
Merge pull request #112 from openseadragon/blur
...
Fixed blendTile()-related blurriness issue (for #95 )
2013-05-30 09:24:30 -07:00
Ventero
b66dd7bed0
Don't load the tile source again when creating a navigator.
...
Previously, when showNavigator was set to true when creating the
viewer, the navigator would unnecessarily load and parse the tile
source, even though a fully parsed object already exists.
2013-05-30 02:53:53 +02:00
Robert Hickman
b5d977d593
Adding an option that allows the previous and next buttons to wrap around past the end or beginning images.
2013-05-29 17:10:45 -06:00
Ian Gilman
1d51b72785
Fixed blendTile()-related blurriness issue
...
We were setting drawer.updateAgain to the result of each blendTile(),
which meant it was keeping only the last result. Instead we should have
been only setting it to true if blendTile returned true, but never
setting it to false. Fixed.
2013-05-29 11:18:25 -07:00
David Steinbrunner
91da6af392
domn to down typo fixes
2013-05-28 17:34:20 -04:00
Ian Gilman
b7eb78a57a
Additional doc comments for setControlsEnabled()
2013-05-28 13:54:13 -07:00
David Steinbrunner
7330b4a726
Correction to setControlsEnabled function name in comments
2013-05-28 17:36:09 -03:00
houseofyin
6385b0a296
Merge branch 'master' of github.com:openseadragon/openseadragon into issue37-navigator
2013-05-26 21:17:01 -04:00
houseofyin
f632d98730
Working on follow-up on the initial pull request. Changing the default navigator display property, and starting work on the docs
2013-05-26 21:16:56 -04:00
Ian Gilman
8e37633c49
Whitespace nits
2013-05-24 09:17:26 -07:00
Ian Gilman
8f53c564da
Our requestAnimationFrame no longer changes the global window object
2013-05-23 09:48:38 -07:00
Chris Adams
568d6a1c6b
Paranoid requestAnimationFrame for antique Firefox
...
Very old versions of Firefox - e.g. Firefox 7 - have
window.requestAnimationFrame but not cancelAnimationFrame. This is a
very old release so the easiest fix is simply to check for both of the
functions which we intend to call and fall back on traditional behaviour
if both aren't present.
2013-05-23 10:17:41 -04:00
Ian Gilman
c3772df011
Now trying standard path first in createAjaxRequest
...
As suggested by @cskwg in #98
2013-05-21 10:39:10 -07:00
Ian Gilman
674c0a069d
Fixed typos in comments
2013-05-20 09:40:17 -07:00
iangilman
da86ca2e38
Merge pull request #46 from houseofyin/issue37-navigator
...
Issue37 navigator
2013-05-20 09:38:49 -07:00
houseofyin
bb4a8a0b4f
Bringing back in sync with the latest baseline
2013-05-17 22:29:08 -04:00
Benjamin Gilbert
fa1a8b2dde
Fix Drawer event emission
...
Drawer tries to emit events on the parent Viewer object but doesn't have
a reference to it. Add a reference when constructing the Drawer.
2013-05-16 02:49:29 -04:00
Ian Gilman
c78f3ef743
Fixed mislabeled JSDoc comment for OpenSeadragon.Viewer.prototype.open
2013-05-14 10:29:15 -07:00
Ian Gilman
2566b2f5cf
Separated file JSDoc comment from root object JSDoc comment; fixes doc building
2013-05-14 10:28:44 -07:00
iangilman
0b366d7b42
Merge pull request #89 from bgilbert/license
...
Revert to original New BSD license; clean up license declarations
2013-05-14 09:15:00 -07:00
Benjamin Gilbert
665ecd6655
Document New BSD license on @jpstroop's IIIF code
2013-05-14 00:20:35 -04:00
Benjamin Gilbert
fcc119bb84
Add file-specific descriptions to file headers
2013-05-14 00:00:24 -04:00
Benjamin Gilbert
7939fa7c4d
Replace GitHub issue numbers with full URLs
2013-05-13 23:39:27 -04:00
Benjamin Gilbert
17a6ee15b1
Include 2010 in "OpenSeadragon contributors" copyright dates
...
This Git repository starts in 2011, but the CodePlex Mercurial repository
has commits from 2010.
2013-05-13 23:32:09 -04:00
Benjamin Gilbert
99d6ff80b6
Add fullpage class to viewer element when in fullpage mode
...
Closes #61 .
2013-05-12 23:02:18 -04:00
Benjamin Gilbert
522bcbf058
Add addClass()/removeClass() utility functions
2013-05-12 22:53:41 -04:00
Benjamin Gilbert
56f5000d90
Document MIT license on John Dyer's fullscreen code
...
See #81 .
2013-05-12 21:33:55 -04:00
Benjamin Gilbert
d80d928d80
Document New BSD license on seajax-utils OSM/TMS code
...
@rsimon has given permission in #58 for the OSM/TMS code that originated
in seajax-utils to be released under the New BSD license.
2013-05-12 18:07:20 -04:00
Benjamin Gilbert
2f2eba8df2
Add "OpenSeadragon contributors" copyright statement
...
The license text will be provided on the website, etc., and it seems
strange to list no copyright date newer than the original CodePlex
copyright from the AJAX Control Toolkit. Add a blanket copyright
statement for contributions to the OpenSeadragon project, stating that
copyright is held by the authors of each contribution. This blanket
statement is not intended to preclude individual contributors from
attaching their own copyright statements to their modifications.
2013-05-12 17:12:26 -04:00
Ian Gilman
199c2f6c2d
Merge branch 'master' of github.com:openseadragon/openseadragon
...
Fixed Conflicts:
test/test.html
2013-05-10 11:59:09 -07:00
Ian Gilman
c6f8b5e192
Fixed broken viewer.raiseEvent calls in drawer.js
2013-05-10 11:32:22 -07:00
Heath Nielson
eb14eae428
Merge remote branch 'upstream/master' into getString-error
...
Conflicts:
test/test.html
2013-05-10 11:54:45 -06:00
Benjamin Gilbert
52badbef36
Add MIT license blocks to src/openseadragon.js
...
for code taken from jQuery and from mattsnider.com.
Ideally we'd keep the MIT-licensed helper code in a separate file,
but it proved difficult to extricate from the rest of openseadragon.js.
Also remove comment about plagiarism. It's not plagiarism if it's
attributed and properly licensed.
2013-05-10 00:57:49 -04:00
Benjamin Gilbert
a7c96c56ef
Drop MIT license; move BSD license to root directory
...
All OpenSeadragon contributors have granted their permission for this
relicensing in #58 .
Drop copyright statements for Ian Gilman and Christopher Thatcher as
they requested in #10 .
Revert CodePlex Foundation copyright date to 2009 pursuant to discussion
in #10 .
2013-05-10 00:16:55 -04:00