Commit Graph

2420 Commits

Author SHA1 Message Date
Ian Gilman
cd329016bb Merge branch 'collections' into bugs 2015-01-02 11:19:44 -08:00
Ian Gilman
48eaf7c805 Merge branch 'master' into collections 2014-12-31 15:17:43 -08:00
Ian Gilman
92fa9cf36a Merge pull request #552 from msalsbery/mousetracker
MouseTracker - Added explicit pointer capture for touch event model events
2014-12-31 15:16:42 -08:00
Mark Salsbery
05ba23ea55 changelog update - added PR # 2014-12-31 14:41:27 -08:00
Mark Salsbery
49e1a8b8e2 changelog update 2014-12-31 14:39:37 -08:00
Mark Salsbery
b39d31a845 MouseTracker - Added explicit pointer capture for touch event model events 2014-12-31 14:30:10 -08:00
Ian Gilman
68dfc79101 Merge branch 'collections' into bugs 2014-12-31 11:16:33 -08:00
Ian Gilman
0edef40db2 Merge branch 'master' into collections 2014-12-31 11:13:27 -08:00
Ian Gilman
3e76bfdd9e Changelog for #518 2014-12-31 11:08:06 -08:00
Ian Gilman
332d2298c4 Merge pull request #550 from msalsbery/mousetracker
MouseTracker fixes for #502, #518, #527
2014-12-31 11:01:26 -08:00
Mark Salsbery
8d4c776cd0 MouseTracker fixes for #502, #518, #527, #539 2014-12-30 12:57:17 -08:00
Ian Gilman
b141a22c87 Merge pull request #544 from kim-company/fix-imageloader
Fix the jobLimit of the imageLoader
2014-12-29 11:48:20 -08:00
Adam Carruthers
6e49f80248 Prevent mobile keyboard from opening
Adds readonly property to .keyboard-command-area to prevent
input, but allow keys to be captured.
2014-12-22 20:29:44 -07:00
Philip Giuliani
b8a7d33ebb Fix documentation of jobLimit 2014-12-22 08:51:57 +01:00
Ian Gilman
a8b9e2b88f Fix for one viewport unit test 2014-12-19 16:53:30 -08:00
Ian Gilman
a0092a4298 Merge branch 'collections' into bugs 2014-12-19 16:14:46 -08:00
Ian Gilman
062ee6227b Merge branch 'master' into collections 2014-12-19 16:14:16 -08:00
Ian Gilman
c6b1efe85d Added pause and "add more" buttons to animation demo 2014-12-19 15:55:24 -08:00
Ian Gilman
c9708399a1 Fixed bug with passing single literal tilesource on construction 2014-12-19 15:32:19 -08:00
Ian Gilman
ce8b0358ff Test for item positions + navigator 2014-12-19 15:21:57 -08:00
Ian Gilman
f1610425bc Navigator now updates when items are moved 2014-12-19 13:57:08 -08:00
Ian Gilman
c0163f7d6b Merge branch 'collections' into bugs
fixed Conflicts:
	test/demo/collections/main.js
2014-12-19 11:58:41 -08:00
Ian Gilman
d86d0ad7ea Merge pull request #535 from openseadragon/ian
IE8 fixes for DZI and World.removeItem
2014-12-19 11:56:37 -08:00
Philip Giuliani
71cbd84879 Fix case of filename
All files are downcased so far.
2014-12-19 16:06:21 +01:00
Philip Giuliani
b82f5cea76 Fixed imageLoaderLimit
Currently jobsInProgress was not incremented after adding a job. So it
has gone into the - range and was like unlimited jobs.
2014-12-19 15:50:19 +01:00
Philip Giuliani
c737bad66e Fix the jobLimit of the imageLoader
Fixes #490
2014-12-19 15:17:15 +01:00
Ian Gilman
e98d47e3ce Fixed erroneous "undefined" asserts 2014-12-18 15:21:48 -08:00
Ian Gilman
12b412df61 Merge pull request #521 from nein09/viewport-tests
Viewport tests
2014-12-18 09:58:08 -08:00
nein09
00510c6cc2 Refactor other looping tests that don't reopen the viewer in a similar manner. 2014-12-15 09:41:32 -08:00
nein09
aebfecb4e8 Factor out looping and reopening viewer into a helper method, based on Ian's example. 2014-12-14 13:15:50 -08:00
nein09
e901248816 Explicitly call viewport.update() after zooming and make the test expected values reflect that action. 2014-12-14 11:08:54 -08:00
Ian Gilman
40d8f84187 Testing 2014-12-12 16:28:02 -08:00
nein09
c4fac82489 Clean up errors found by SublimeLinter. 2014-12-12 12:51:50 -08:00
Ian Gilman
d1627f9975 Merge branch 'collections' into ian 2014-12-11 17:10:00 -08:00
Ian Gilman
d85d4d492d Merge pull request #538 from openseadragon/ian2
Using highsmith for animation demo
2014-12-05 11:06:38 -08:00
Ian Gilman
549ce64238 Using highsmith for animation demo 2014-12-05 11:05:50 -08:00
Adam Carruthers
69e9326d4f fix #500 - requests keyboard focus when canvas is clicked
The canvas click listener will now check if keyboard-command-area has
focus, and if it does not, it will request it.
2014-12-04 17:06:33 -05:00
Ian Gilman
6d7606bfd3 Merge pull request #536 from openseadragon/ian2
Animation demo
2014-12-04 13:37:24 -08:00
Ian Gilman
222f942752 Animation demo 2014-12-04 13:36:02 -08:00
Ian Gilman
28b1296105 IE8 fixes for DZI and World.removeItem 2014-12-04 12:00:04 -08:00
Ian Gilman
b22864ca6e Merge pull request #533 from openseadragon/ian2
tiledImages can now animate their positions and sizes
2014-12-03 13:42:13 -08:00
Ian Gilman
6b0e44d037 Merge branch 'collections' into ian2
fixed Conflicts:
	test/demo/collections/main.js
2014-12-03 13:37:44 -08:00
Ian Gilman
e1e7176724 Merge pull request #532 from openseadragon/ian
Auto-resize now works for multi-image
2014-12-03 13:35:10 -08:00
Ian Gilman
211127b87b Fixed window resize for navigator with multi-image 2014-12-03 11:13:06 -08:00
Ian Gilman
fd40c1a829 Test for tiledImage animation 2014-12-02 13:29:52 -08:00
Ian Gilman
09e494091e More fixes for tiledImage animation 2014-12-02 13:17:56 -08:00
Ian Gilman
6a7f56d858 tiledImage bounds animation now works 2014-12-02 11:44:02 -08:00
Ian Gilman
7078826be1 Auto-resize now works for multi-image 2014-12-01 16:29:21 -08:00
Ian Gilman
4e788473b0 image springs start 2014-11-24 17:47:16 -08:00
Ian Gilman
a24e4f8210 Merge pull request #526 from openseadragon/ian
Collections stretch goals
2014-11-24 13:31:20 -08:00