Merge remote-tracking branch 'origin/master' into jsdoc3-documentation

changelog.txt

@@ -54,6 +54,7 @@ OPENSEADRAGON CHANGELOG
     * Viewer.innerTracker.dragHandler: preventDefaultAction == true prevents viewer panning with mouse/touch
     * Viewer.innerTracker.scrollHandler: preventDefaultAction == true prevents viewer zooming on mousewheel/pinch
 * Fixed: IE8 error with custom buttons - "Object doesn't support this action" (#279)
+* Support IIIF servers that don't report tile dimensions (#286)
 
 0.9.131:
 

package.json

@@ -3,17 +3,17 @@
   "version": "0.9.131",
   "description": "Provides a smooth, zoomable user interface for HTML/Javascript.",
   "devDependencies": {
-    "grunt": "~0.4.0",
+    "grunt": "~0.4.1",
-    "grunt-contrib-compress": "~0.5.0",
+    "grunt-contrib-compress": "~0.5.2",
-    "grunt-contrib-concat": "~0.1.2",
+    "grunt-contrib-concat": "~0.3.0",
-    "grunt-contrib-jshint": "~0.6.0",
+    "grunt-contrib-jshint": "~0.7.2",
-    "grunt-contrib-uglify": "~0.2.2",
+    "grunt-contrib-uglify": "~0.2.7",
-    "grunt-contrib-qunit": "~0.2.0",
+    "grunt-contrib-qunit": "~0.3.0",
-    "grunt-contrib-connect": "~0.1.2",
+    "grunt-contrib-connect": "~0.5.0",
-    "grunt-contrib-watch": "~0.2.0",
+    "grunt-contrib-watch": "~0.5.3",
-    "grunt-contrib-clean": "~0.4.0",
+    "grunt-contrib-clean": "~0.5.0",
     "grunt-git-describe": "~2.0.0",
-    "grunt-text-replace": "~0.3.2"
+    "grunt-text-replace": "~0.3.9"
   },
   "scripts": {
     "test": "grunt test"

src/iiif1_1tilesource.js

@@ -51,7 +51,12 @@ $.IIIF1_1TileSource = function( options ){
         throw new Error('IIIF required parameters not provided.');
     }
 
-    options.tileSize = this.tile_width;
+    if ( !(this.tile_width && this.tile_height) ) {
+        // use the short dimension if there aren't tile sizes provided.
+        options.tileSize = Math.min(this.height, this.width);
+    } else {
+        options.tileSize = this.tile_width;
+    }
 
     if (! options.maxLevel ) {
         var mf = -1;
@@ -82,7 +87,6 @@ $.extend( $.IIIF1_1TileSource.prototype, $.TileSource.prototype, /** @lends Open
             "http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level0" == data.profile ||
             "http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level1" == data.profile ||
             "http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level2" == data.profile ||
-            "http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level3" == data.profile ||
             "http://library.stanford.edu/iiif/image-api/1.1/compliance.html" == data.profile
         );
     },

test/data/iiif_no_tiles.json

@@ -0,0 +1,19 @@
+{
+  "profile": "http://library.stanford.edu/iiif/image-api/1.1/compliance.html#level2",
+  "height": 850,
+  "width": 1024,
+  "qualities": [
+    "native",
+    "color",
+    "grey",
+    "bitonal"
+  ],
+  "formats": [
+    "jpg",
+    "png",
+    "gif"
+  ],
+  "@context": "http://library.stanford.edu/iiif/image-api/1.1/context.json",
+  "@id": "http://localhost:8000/test/data/iiif_no_tiles"
+}
+

test/formats.js

@@ -80,4 +80,9 @@
         testOpen('iiif1_1.json');
     });
 
+        // ----------
+    asyncTest('IIIF No Tiles', function() {
+        testOpen('iiif_no_tiles.json');
+    });
+
 })();