From 070a48f6c89cf7ab60ab2cb0610e24b19595d32c Mon Sep 17 00:00:00 2001 From: thatcher Date: Tue, 19 Feb 2013 22:53:54 -0500 Subject: [PATCH] fixing jsdocs that caused recursion --- grunt.js | 3 ++- src/dzitilesource.js | 4 ++-- src/iiiftilesource.js | 4 +--- src/legacytilesource.js | 10 +++++++--- src/osmtilesource.js | 2 +- src/referencestrip.js | 2 +- src/tilesourcecollection.js | 3 ++- 7 files changed, 16 insertions(+), 12 deletions(-) diff --git a/grunt.js b/grunt.js index 6d57fc51..36c228c8 100644 --- a/grunt.js +++ b/grunt.js @@ -69,7 +69,7 @@ module.exports = function(grunt) { }, server: { port: 8000, - base: "." + base: "../openseadragon.github.com"//"." }, watch: { files: [ "grunt.js", "src/*.js" ], @@ -115,4 +115,5 @@ module.exports = function(grunt) { // Package task. grunt.registerTask("package", "default compress"); + }; diff --git a/src/dzitilesource.js b/src/dzitilesource.js index 621a8230..7e37caa7 100644 --- a/src/dzitilesource.js +++ b/src/dzitilesource.js @@ -244,7 +244,7 @@ function configureFromXML( tileSource, xmlDoc ){ Y: parseInt( rectNode.getAttribute( "Y" ), 10 ), Width: parseInt( rectNode.getAttribute( "Width" ), 10 ), Height: parseInt( rectNode.getAttribute( "Height" ), 10 ), - MinLevel: 0, // ignore MinLevel attribute, bug in Deep Zoom Composer + MinLevel: parseInt( dispRectNode.getAttribute( "MinLevel" ), 10 ), MaxLevel: parseInt( dispRectNode.getAttribute( "MaxLevel" ), 10 ) } }); @@ -310,7 +310,7 @@ function configureFromObject( tileSource, configuration ){ parseInt( rectData.Y, 10 ), parseInt( rectData.Width, 10 ), parseInt( rectData.Height, 10 ), - 0, // ignore MinLevel attribute, bug in Deep Zoom Composer + parseInt( rectData.MinLevel, 10 ), parseInt( rectData.MaxLevel, 10 ) )); } diff --git a/src/iiiftilesource.js b/src/iiiftilesource.js index 1cf51de5..8cf3fc5b 100644 --- a/src/iiiftilesource.js +++ b/src/iiiftilesource.js @@ -9,7 +9,7 @@ * https://gist.github.com/jpstroop/4624253 * * @class - * @name OpenSeadragon.IIIFTileSource + * @extends OpenSeadragon.TileSource * @see http://library.stanford.edu/iiif/image-api/ */ $.IIIFTileSource = function( options ){ @@ -35,8 +35,6 @@ $.IIIFTileSource = function( options ){ }; $.extend( $.IIIFTileSource.prototype, $.TileSource.prototype, { - - /** * Determine if the data and/or url imply the image service is supported by * this tile source. diff --git a/src/legacytilesource.js b/src/legacytilesource.js index 70fb6979..7ba4e952 100644 --- a/src/legacytilesource.js +++ b/src/legacytilesource.js @@ -1,6 +1,5 @@ (function( $ ){ - /** * The LegacyTileSource allows simple, traditional image pyramids to be loaded * into an OpenSeadragon Viewer. Basically, this translates to the historically @@ -9,6 +8,7 @@ * resolution image and a high resolution image in standard web formats like * png or jpg. * @class + * @extends OpenSeadragon.TileSource * @param {Array} levels An array of file descriptions, each is an object with * a 'url', a 'width', and a 'height'. Overriding classes can expect more * properties but these properties are sufficient for this implementation. @@ -59,7 +59,7 @@ $.extend( $.LegacyTileSource.prototype, $.TileSource.prototype, { * Determine if the data and/or url imply the image service is supported by * this tile source. * @function - * @name OpenSeadragon.DziTileSource.prototype.supports + * @name OpenSeadragon.LegacyTileSource.prototype.supports * @param {Object|Array} data * @param {String} optional - url */ @@ -77,7 +77,7 @@ $.extend( $.LegacyTileSource.prototype, $.TileSource.prototype, { /** * * @function - * @name OpenSeadragon.DziTileSource.prototype.configure + * @name OpenSeadragon.LegacyTileSource.prototype.configure * @param {Object|XMLDocument} configuration - the raw configuration * @param {String} dataUrl - the url the data was retreived from if any. * @return {Object} options - A dictionary of keyword arguments sufficient @@ -102,6 +102,7 @@ $.extend( $.LegacyTileSource.prototype, $.TileSource.prototype, { /** * @function + * @name OpenSeadragon.LegacyTileSource.prototype.getLevelScale * @param {Number} level */ getLevelScale: function( level ) { @@ -116,6 +117,7 @@ $.extend( $.LegacyTileSource.prototype, $.TileSource.prototype, { /** * @function + * @name OpenSeadragon.LegacyTileSource.prototype.getNumTiles * @param {Number} level */ getNumTiles: function( level ) { @@ -129,6 +131,7 @@ $.extend( $.LegacyTileSource.prototype, $.TileSource.prototype, { /** * @function + * @name OpenSeadragon.LegacyTileSource.prototype.getTileAtPoint * @param {Number} level * @param {OpenSeadragon.Point} point */ @@ -143,6 +146,7 @@ $.extend( $.LegacyTileSource.prototype, $.TileSource.prototype, { * server technologies, and various specifications for building image * pyramids, this method is here to allow easy integration. * @function + * @name OpenSeadragon.LegacyTileSource.prototype.getTileUrl * @param {Number} level * @param {Number} x * @param {Number} y diff --git a/src/osmtilesource.js b/src/osmtilesource.js index 4b72276c..b8c43dea 100644 --- a/src/osmtilesource.js +++ b/src/osmtilesource.js @@ -65,7 +65,7 @@ $.extend( $.OsmTileSource.prototype, $.TileSource.prototype, { * Determine if the data and/or url imply the image service is supported by * this tile source. * @function - * @name OpenSeadragon.DziTileSource.prototype.supports + * @name OpenSeadragon.OsmTileSource.prototype.supports * @param {Object|Array} data * @param {String} optional - url */ diff --git a/src/referencestrip.js b/src/referencestrip.js index bb3051e4..b0e34285 100644 --- a/src/referencestrip.js +++ b/src/referencestrip.js @@ -238,7 +238,7 @@ $.extend( $.ReferenceStrip.prototype, $.EventHandler.prototype, $.Viewer.prototy }, /** * @function - * @name OpenSeadragon.Navigator.prototype.update + * @name OpenSeadragon.ReferenceStrip.prototype.update */ update: function( viewport ){ diff --git a/src/tilesourcecollection.js b/src/tilesourcecollection.js index 3e94f660..a64d6d0c 100644 --- a/src/tilesourcecollection.js +++ b/src/tilesourcecollection.js @@ -2,7 +2,7 @@ /** * @class - * @extends OpenSeadragon.TileSourceCollection + * @extends OpenSeadragon.TileSource */ $.TileSourceCollection = function( tileSize, tileSources, rows, layout ) { @@ -62,6 +62,7 @@ $.extend( $.TileSourceCollection.prototype, $.TileSource.prototype, { /** * @function + * @name OpenSeadragon.TileSourceCollection.prototype.getTileBounds * @param {Number} level * @param {Number} x * @param {Number} y