From 7bb02d51d08084814e5e9fa95d4c04a2ca4c354a Mon Sep 17 00:00:00 2001 From: Tom Date: Wed, 14 Jun 2023 07:51:50 -0700 Subject: [PATCH] reverted change to argument order in _updateTile call --- src/canvasdrawer.js | 8 ++++++-- src/drawerbase.js | 20 ++++++++++++++++---- src/htmldrawer.js | 4 ++-- src/tiledimage.js | 2 +- 4 files changed, 25 insertions(+), 9 deletions(-) diff --git a/src/canvasdrawer.js b/src/canvasdrawer.js index efd0adad..4b51daa4 100644 --- a/src/canvasdrawer.js +++ b/src/canvasdrawer.js @@ -46,8 +46,12 @@ */ class CanvasDrawer extends $.DrawerBase{ - constructor(options){ - super(options); + constructor(){ + super(...arguments); + + // Options + + /** * 2d drawing context for {@link OpenSeadragon.Drawer#canvas} if it's a <canvas> element, otherwise null. diff --git a/src/drawerbase.js b/src/drawerbase.js index a25cf0ac..0939b354 100644 --- a/src/drawerbase.js +++ b/src/drawerbase.js @@ -34,6 +34,10 @@ (function( $ ){ +$.DrawerOptions = class DrawerOptions{ + constructor(options){} +}; + /** * @class DrawerBase * @memberof OpenSeadragon @@ -44,7 +48,7 @@ * @param {Element} options.element - Parent element. */ -class DrawerBase{ +$.DrawerBase = class DrawerBase{ constructor(options){ $.console.assert( options.viewer, "[Drawer] options.viewer is required" ); @@ -67,6 +71,15 @@ class DrawerBase{ $.console.error( "[Drawer] options.source is no longer accepted; use TiledImage instead" ); } + + // Object.entries({}).forEach( ([key, value]) => { + // try{ + // this[key] = value; + // } catch(e) { + // $.console.error(`This Drawer implementation does not support option '${key}:${value}'`); + // } + // }); + this.viewer = options.viewer; this.viewport = options.viewport; this.debugGridColor = typeof options.debugGridColor === 'string' ? [options.debugGridColor] : options.debugGridColor || $.DEFAULT_SETTINGS.debugGridColor; @@ -130,6 +143,7 @@ class DrawerBase{ get isOpenSeadragonDrawer(){ return true; } + /** * @param tiledImage the TiledImage that is ready to be drawn */ @@ -259,8 +273,6 @@ class DrawerBase{ }; } -} -$.DrawerBase = DrawerBase; - +}; }( OpenSeadragon )); diff --git a/src/htmldrawer.js b/src/htmldrawer.js index 0fc4cd6d..3d3b8bf8 100644 --- a/src/htmldrawer.js +++ b/src/htmldrawer.js @@ -46,8 +46,8 @@ */ class HTMLDrawer extends $.DrawerBase{ - constructor(options){ - super(options); + constructor(){ + super(...arguments); /** * 2d drawing context for {@link OpenSeadragon.Drawer#canvas} if it's a <canvas> element, otherwise null. diff --git a/src/tiledimage.js b/src/tiledimage.js index ffd4e015..3e8b88b3 100644 --- a/src/tiledimage.js +++ b/src/tiledimage.js @@ -1597,8 +1597,8 @@ $.extend($.TiledImage.prototype, $.EventSource.prototype, /** @lends OpenSeadrag } var result = this._updateTile( - haveDrawn, drawLevel, + haveDrawn, flippedX, y, level, levelVisibility,