Commit Graph

370 Commits

Author SHA1 Message Date
Grant Echols
9e142313d6 Added small checks around code to make m2 sample work locally. 2015-08-11 09:24:35 -06:00
Antoine Vandecreme
d960c69b34 Replace eval call when passing a Json string. 2015-07-30 16:44:41 -04:00
Ian Gilman
1c17374de1 Tweaks for #673 2015-07-15 09:50:15 -07:00
Conner Wingard
b687332c9e Fix merge conflict in upstream changelog.txt 2015-07-14 16:46:47 -04:00
Conner Wingard
e1e345a4bc Clean up TileSource object when provided tileWidth/tileHeight for clarity. Add basic TileSource tests. 2015-07-14 14:49:52 -04:00
Ian Gilman
35c7a30dc2 Merge pull request #680 from LarissaSmith/master
Adds collectionColumns as a configuration parameter
2015-07-08 08:57:35 -07:00
Larissa Smith
57e6fdde90 Added tests for collectionColumns use by world.arrange. 2015-07-07 14:09:49 -06:00
Ian Gilman
e93a0862bd Added demo for TileSource swapping 2015-07-03 10:19:10 -07:00
Rick Smith
cdf1942202 Create demo for creating an overlay 2015-06-23 16:02:46 -06:00
Ian Gilman
6ffc81760c Merge pull request #662 from avandecreme/coordinates
Add coordinates conversion methods to TiledImage.
2015-06-19 13:13:12 -07:00
Antoine Vandecreme
d671049a17 Fix and add unit tests. 2015-06-11 15:27:36 -04:00
Antoine Vandecreme
584daea732 Doc and test messages fix. 2015-06-11 10:59:32 -04:00
Antoine Vandecreme
fa868a039d Fix editorconfig config. 2015-06-11 10:49:32 -04:00
Antoine Vandecreme
606d25dbe6 Merge upstream. 2015-06-08 10:38:16 -04:00
Antoine Vandecreme
b9a6b7910e Add unit tests. 2015-06-04 15:32:10 -04:00
Antoine Vandecreme
7e39a528c0 Add tests for tile-loaded event. 2015-06-04 09:47:50 -04:00
Antoine Vandecreme
aa021d87c0 Add coordinates conversion methods to TiledImage. 2015-06-02 16:41:37 -04:00
Antoine Vandecreme
f5ede70018 Fix coordinates demo. 2015-05-09 12:49:32 -04:00
Antoine Vandecreme
39bd370930 Add opacity test in tiledimage. 2015-04-27 19:28:18 -04:00
Antoine Vandecreme
6bc5f1ff51 Fix drawer tests. 2015-04-22 20:12:38 -04:00
Ian Gilman
332b28ab2d * Now animating zoom spring exponentially 2015-03-30 14:50:37 -07:00
Ian Gilman
823e9c3d22 Non-Harvard version of M2 clip demo 2015-03-20 10:17:27 -07:00
Ian Gilman
e433863f09 Test for clip feature 2015-03-20 10:09:33 -07:00
Ian Gilman
e1d36ffb14 First version of clip feature 2015-03-18 10:03:44 -07:00
Ian Gilman
19ade7d76d Improved zoom and pan constraints 2015-03-11 15:41:36 -07:00
Ian Gilman
815cbd6019 Detail on/off button (m2) 2015-03-09 15:32:38 -07:00
Antoine Vandecreme
ed72ae748f Fix tests and coverage 2015-02-27 14:07:42 -05:00
Antoine Vandecreme
a372274ee1 Fix Cross Origin policy not working (#612)
Remove useless hostUrl field
2015-02-26 17:57:31 -05:00
Ian Gilman
2cd54648f0 Demos of alternates and details in non-Harvard version (m2) 2015-02-16 10:45:46 -08:00
Ian Gilman
70e08a02ce Positioning alternates better (m2) 2015-02-16 10:18:59 -08:00
Ian Gilman
725bc36c4e Detail view (m2) 2015-02-13 15:55:57 -08:00
Ian Gilman
de18b3dc63 Refactoring (m2) 2015-02-13 14:32:17 -08:00
Ian Gilman
ae7adad5cf Alternate images (m2) 2015-02-10 14:02:41 -08:00
Ian Gilman
5443eedebc Fixed positioning issue when going to book mode with tall images (m2) 2015-02-10 11:53:56 -08:00
Ian Gilman
f531a18531 Fixed mouse positioning (m2) 2015-02-10 11:42:36 -08:00
Ian Gilman
20443e30f1 Fixes for viewport tests with collections 2015-02-09 10:36:07 -08:00
Ian Gilman
6cb08a8b58 Merge branch 'master' into collections 2015-02-09 10:18:30 -08:00
Ian Gilman
0e67b9c204 Added TODO marker for #589 2015-02-09 09:24:43 -08:00
nein09
449e80bf24 Fix the viewport bounds for fitBoundsWithConstraints 2015-02-08 22:46:55 -08:00
Ian Gilman
5161793948 m2 readme 2015-02-04 10:23:24 -08:00
Ian Gilman
80d8d2e96f Prepped m2 demo for merging 2015-02-04 10:18:36 -08:00
nein09
ed0ffb14cf Change the fitBoundsWithConstraints test according to feedback (I think) 2015-02-01 23:29:30 -08:00
nein09
8ce77c51fb Merge branch 'master' into viewport-tests 2015-02-01 22:14:43 -08:00
Ian Gilman
408a8f6fd3 400+ collection; repeated nexts (m2) 2015-01-23 16:00:58 -08:00
Ian Gilman
a923c3f09c Fixed issues with panning in scroll view (m2) 2015-01-22 11:52:08 -08:00
Ian Gilman
ae3b100483 Merge branch 'collections' into m2 2015-01-22 11:16:09 -08:00
Ian Gilman
735fcc3e37 Merge branch 'master' into collections
fixed Conflicts:
	src/navigator.js
	src/openseadragon.js
2015-01-22 11:15:45 -08:00
Mark Salsbery
545997bace MouseTracker now defaults to tracking on (#558) 2015-01-20 18:35:58 -08:00
Ian Gilman
54be2b4b48 Fixed issues with window resizing (m2) 2015-01-20 17:19:20 -08:00
Ian Gilman
ec2e4a4e8f Refactored how scrolling works (m2) 2015-01-20 16:10:24 -08:00