Minor style fixes

This commit is contained in:
Ralph Krimmel 2016-02-25 10:16:08 +01:00
parent 48eee7e75c
commit 7d4eff0bb8

View File

@ -15,14 +15,23 @@
options.tileSize = 256; options.tileSize = 256;
var currentImageSize = {x:options.width,y:options.height}; var currentImageSize = {
options.imageSizes = [{x:options.width,y:options.height}]; x: options.width,
y: options.height
};
options.imageSizes = [{
x: options.width,
y: options.height
}];
options.gridSize = [this._getGridSize(options.width, options.height, options.tileSize)]; options.gridSize = [this._getGridSize(options.width, options.height, options.tileSize)];
while(parseInt(currentImageSize.x) > options.tileSize || parseInt(currentImageSize.y) > options.tileSize) { while (parseInt(currentImageSize.x, 10) > options.tileSize || parseInt(currentImageSize.y, 10) > options.tileSize) {
currentImageSize.x = Math.floor(currentImageSize.x / 2); currentImageSize.x = Math.floor(currentImageSize.x / 2);
currentImageSize.y = Math.floor(currentImageSize.y / 2); currentImageSize.y = Math.floor(currentImageSize.y / 2);
options.imageSizes.push({x:currentImageSize.x,y:currentImageSize.y}); options.imageSizes.push({
x: currentImageSize.x,
y: currentImageSize.y
});
options.gridSize.push(this._getGridSize(currentImageSize.x, currentImageSize.y, options.tileSize)); options.gridSize.push(this._getGridSize(currentImageSize.x, currentImageSize.y, options.tileSize));
} }
options.imageSizes.reverse(); options.imageSizes.reverse();
@ -37,10 +46,15 @@
$.extend($.ZoomifyTileSource.prototype, $.TileSource.prototype, /** @lends OpenSeadragon.ZoomifyTileSource.prototype */ { $.extend($.ZoomifyTileSource.prototype, $.TileSource.prototype, /** @lends OpenSeadragon.ZoomifyTileSource.prototype */ {
//private
_getGridSize: function(width, height, tileSize) { _getGridSize: function(width, height, tileSize) {
return {x: Math.ceil(width/tileSize),y:Math.ceil(height/tileSize)}; return {
x: Math.ceil(width / tileSize),
y: Math.ceil(height / tileSize)
};
}, },
//private
_calculateAbsoluteTileNumber: function(level, x, y) { _calculateAbsoluteTileNumber: function(level, x, y) {
var num = 0; var num = 0;
for (var z = 0; z < level; z++) { for (var z = 0; z < level; z++) {
@ -60,7 +74,6 @@
* @param {String} optional - url * @param {String} optional - url
*/ */
supports: function(data, url) { supports: function(data, url) {
//console.log('ZoomifyTileSource supports ' + data.type);
return (data.type && "zoomifytileservice" == data.type); return (data.type && "zoomifytileservice" == data.type);
}, },
@ -73,7 +86,6 @@
* to configure this tile sources constructor. * to configure this tile sources constructor.
*/ */
configure: function(data, url) { configure: function(data, url) {
//console.log('ZoomifyTileSource configure ' + data.tilesUrl);
return data; return data;
}, },
@ -91,7 +103,7 @@
result = Math.floor(num / 256); result = Math.floor(num / 256);
return this.tilesUrl + 'TileGroup' + result + '/' + level + '-' + x + '-' + y + '.jpg'; return this.tilesUrl + 'TileGroup' + result + '/' + level + '-' + x + '-' + y + '.jpg';
}, }
}); });
}(OpenSeadragon)); }(OpenSeadragon));