Commit Graph

811 Commits

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