diff --git a/dist/iwmlib.js b/dist/iwmlib.js index 834d2f2..eba57b3 100644 --- a/dist/iwmlib.js +++ b/dist/iwmlib.js @@ -5459,7 +5459,7 @@ */ if (nearestNode.tagName == 'svg') { let handler = this.tapNodes.get(nearestNode); - console.log("Clicking beneath SVG: to be done", handler); + console.log("Clicking near SVG: to be done", handler); if (this.triggerSVGClicks) nearestNode.dispatchEvent(new Event('click')); return @@ -7477,8 +7477,8 @@ // MouseEvent const mouseEventOpts = { - screenX: window.screenX + target.offsetLeft + position.x, - screenY: window.screenY + target.offsetTop + position.y, + screenX: window.screenX + (target.offsetLeft || 0) + position.x, + screenY: window.screenY + (target.offsetTop || 0) + position.y, clientX: rect.x + position.x, clientY: rect.y + position.y, ctrlKey: false, diff --git a/dist/iwmlib.pixi.js b/dist/iwmlib.pixi.js index 793cf4c..4a966b9 100644 --- a/dist/iwmlib.pixi.js +++ b/dist/iwmlib.pixi.js @@ -6053,10 +6053,6 @@ window.Capabilities = Capabilities; window.CapabilitiesTests = CapabilitiesTests; - /** Basic class for poppable elements that need to be closed as soon as one poppable is - * shown. - */ - /* eslint-disable no-unused-vars */ /** * A base class for scatter specific events. @@ -7224,7 +7220,7 @@ */ if (nearestNode.tagName == 'svg') { let handler = this.tapNodes.get(nearestNode); - console.log("Clicking beneath SVG: to be done", handler); + console.log("Clicking near SVG: to be done", handler); if (this.triggerSVGClicks) nearestNode.dispatchEvent(new Event('click')); return @@ -14867,7 +14863,7 @@ * @extends Popup * @see {@link https://www.iwm-tuebingen.de/iwmbrowser/lib/pixi/popupmenu.html|DocTest} */ - class PopupMenu$1 extends Popup { + class PopupMenu extends Popup { /** * Creates an instance of a PopupMenu. @@ -15516,7 +15512,7 @@ window.Stylus = Stylus; window.Switch = Switch; window.Popup = Popup; - window.PopupMenu = PopupMenu$1; + window.PopupMenu = PopupMenu; window.Modal = Modal; window.Volatile = Volatile; window.Message = Message; diff --git a/doc/README.md b/doc/README.md index 247e578..5bbcfef 100644 --- a/doc/README.md +++ b/doc/README.md @@ -20,4 +20,3 @@ This is the JavaScript API documentation of the IWM Browser JavaScript classes. - [PixiJS](http://www.pixijs.com) - [Greensock](https://greensock.com) with all Plugins -- [D3](https://d3js.org) diff --git a/doc/out/AbstractPopup.html b/doc/out/AbstractPopup.html index b6c40dd..e544c7b 100644 --- a/doc/out/AbstractPopup.html +++ b/doc/out/AbstractPopup.html @@ -2912,7 +2912,7 @@ a string, a number or a PIXI.Text object.

diff --git a/doc/out/Badge.html b/doc/out/Badge.html index 3bf9cbc..50b4fee 100644 --- a/doc/out/Badge.html +++ b/doc/out/Badge.html @@ -2368,7 +2368,7 @@ a string, a number or a PIXI.Text object.

diff --git a/doc/out/BlurFilter.html b/doc/out/BlurFilter.html index 128f987..d1189d0 100644 --- a/doc/out/BlurFilter.html +++ b/doc/out/BlurFilter.html @@ -1792,7 +1792,7 @@ app.scene.filters = [blurFilter] diff --git a/doc/out/Button.html b/doc/out/Button.html index 8913aac..4e5672c 100644 --- a/doc/out/Button.html +++ b/doc/out/Button.html @@ -1465,7 +1465,7 @@
- button.js:109 + button.js:110
@@ -3369,7 +3369,7 @@ the tint property of the icon sprite.

- button.js:193 + button.js:194
@@ -3493,7 +3493,7 @@ the tint property of the icon sprite.

- button.js:595 + button.js:597
@@ -3598,7 +3598,7 @@ the tint property of the icon sprite.

- button.js:350 + button.js:352
@@ -3703,7 +3703,7 @@ the tint property of the icon sprite.

- button.js:578 + button.js:580
@@ -3810,7 +3810,7 @@ the tint property of the icon sprite.

diff --git a/doc/out/ButtonGroup.html b/doc/out/ButtonGroup.html index fdbd904..994bc8d 100644 --- a/doc/out/ButtonGroup.html +++ b/doc/out/ButtonGroup.html @@ -3206,7 +3206,7 @@ app.scene.addChild(buttonGroup) diff --git a/doc/out/DeepZoomImage.html b/doc/out/DeepZoomImage.html index d45b4b8..542710c 100644 --- a/doc/out/DeepZoomImage.html +++ b/doc/out/DeepZoomImage.html @@ -1469,7 +1469,7 @@ more detailed tiles at the larger level as fast as possible.

- image.js:351 + image.js:338
@@ -1922,7 +1922,7 @@ Adds a PIXI.Container if necessary.

- image.js:608 + image.js:596
@@ -2000,7 +2000,7 @@ rect.

- image.js:837 + image.js:825
@@ -2152,7 +2152,7 @@ rect.

- image.js:1076 + image.js:1067
@@ -2228,7 +2228,7 @@ rect.

- image.js:520 + image.js:508
@@ -2372,7 +2372,7 @@ rect.

- image.js:636 + image.js:624
@@ -2547,7 +2547,7 @@ rect.

- image.js:1014 + image.js:1002
@@ -2668,7 +2668,7 @@ rect.

- image.js:617 + image.js:605
@@ -2746,7 +2746,7 @@ the also overwritten _calculateBounds method.

- image.js:743 + image.js:731
@@ -2921,7 +2921,7 @@ the also overwritten _calculateBounds method.

- image.js:1087 + image.js:1079
@@ -2997,7 +2997,7 @@ the also overwritten _calculateBounds method.

- image.js:974 + image.js:962
@@ -3073,7 +3073,7 @@ the also overwritten _calculateBounds method.

- image.js:989 + image.js:977
@@ -3150,7 +3150,7 @@ visible quadTrees

- image.js:920 + image.js:908
@@ -3272,7 +3272,7 @@ be reused.

- image.js:960 + image.js:948
@@ -3348,7 +3348,7 @@ be reused.

- image.js:893 + image.js:881
@@ -3469,7 +3469,7 @@ be reused.

- image.js:870 + image.js:858
@@ -3620,7 +3620,7 @@ a new Tiles layer if necessary

- image.js:508 + image.js:496
@@ -3741,7 +3741,7 @@ a new Tiles layer if necessary

- image.js:499 + image.js:487
@@ -3862,7 +3862,7 @@ a new Tiles layer if necessary

- image.js:670 + image.js:658
@@ -4076,7 +4076,7 @@ a new Tiles layer if necessary

- image.js:771 + image.js:759
@@ -4220,7 +4220,7 @@ a new Tiles layer if necessary

- image.js:789 + image.js:777
@@ -4413,7 +4413,7 @@ Optional parameter:

- image.js:401 + image.js:389
@@ -4560,7 +4560,7 @@ layer.

- image.js:437 + image.js:425
@@ -4690,7 +4690,7 @@ Can be overwritten in subclasses.

- image.js:627 + image.js:615
@@ -4796,7 +4796,7 @@ large images.

- image.js:944 + image.js:932
@@ -4872,7 +4872,7 @@ large images.

- image.js:1029 + image.js:1017
@@ -5090,7 +5090,7 @@ i.e. after loading a single tile

diff --git a/doc/out/DeepZoomInfo.html b/doc/out/DeepZoomInfo.html index 6260bb7..fc03cd0 100644 --- a/doc/out/DeepZoomInfo.html +++ b/doc/out/DeepZoomInfo.html @@ -1466,7 +1466,7 @@ height and width of the overall image, overlap, and image type.

- image.js:48 + image.js:35
@@ -1631,7 +1631,7 @@ height and width of the overall image, overlap, and image type.

- image.js:238 + image.js:225
@@ -1781,7 +1781,7 @@ height and width of the overall image, overlap, and image type.

- image.js:94 + image.js:81
@@ -1931,7 +1931,7 @@ height and width of the overall image, overlap, and image type.

- image.js:105 + image.js:92
@@ -2081,7 +2081,7 @@ height and width of the overall image, overlap, and image type.

- image.js:80 + image.js:67
@@ -2231,7 +2231,7 @@ height and width of the overall image, overlap, and image type.

- image.js:227 + image.js:214
@@ -2405,7 +2405,7 @@ on completion.

- image.js:196 + image.js:183
@@ -2603,7 +2603,7 @@ on completion.

diff --git a/doc/out/Flippable.html b/doc/out/Flippable.html index 6d3a5be..1b15689 100644 --- a/doc/out/Flippable.html +++ b/doc/out/Flippable.html @@ -1837,7 +1837,7 @@ - Sine.easeOut + Power1.easeOut @@ -2506,7 +2506,7 @@ front.on('click', event => flippable.toggle()) diff --git a/doc/out/FontInfo.html b/doc/out/FontInfo.html index b6c5463..7983e52 100644 --- a/doc/out/FontInfo.html +++ b/doc/out/FontInfo.html @@ -1553,7 +1553,7 @@ diff --git a/doc/out/Hypenate.html b/doc/out/Hypenate.html index f2828e0..cc69b96 100644 --- a/doc/out/Hypenate.html +++ b/doc/out/Hypenate.html @@ -1755,7 +1755,7 @@ diff --git a/doc/out/InteractivePopup.html b/doc/out/InteractivePopup.html index b5e13d4..1e9d4b6 100644 --- a/doc/out/InteractivePopup.html +++ b/doc/out/InteractivePopup.html @@ -2337,7 +2337,7 @@ a string, a number or a PIXI.Text object.

diff --git a/doc/out/LabeledGraphics.exports.LabeledGraphics.html b/doc/out/LabeledGraphics.exports.LabeledGraphics.html index 423a3e9..2aacb44 100644 --- a/doc/out/LabeledGraphics.exports.LabeledGraphics.html +++ b/doc/out/LabeledGraphics.exports.LabeledGraphics.html @@ -1555,7 +1555,7 @@ diff --git a/doc/out/LabeledGraphics.html b/doc/out/LabeledGraphics.html index 357bc5b..515e009 100644 --- a/doc/out/LabeledGraphics.html +++ b/doc/out/LabeledGraphics.html @@ -2620,7 +2620,7 @@ than wanted

diff --git a/doc/out/List.html b/doc/out/List.html index 1511eb7..607ec99 100644 --- a/doc/out/List.html +++ b/doc/out/List.html @@ -2579,7 +2579,7 @@ app.scene.addChild(list) diff --git a/doc/out/Message.html b/doc/out/Message.html index 0433386..cae27e1 100644 --- a/doc/out/Message.html +++ b/doc/out/Message.html @@ -2435,7 +2435,7 @@ a string, a number or a PIXI.Text object.

diff --git a/doc/out/MessageInteractivePopup.html b/doc/out/MessageInteractivePopup.html index 0b8019c..1d71f6c 100644 --- a/doc/out/MessageInteractivePopup.html +++ b/doc/out/MessageInteractivePopup.html @@ -1783,7 +1783,7 @@ like Popup, Message...

diff --git a/doc/out/MessageMessageInteractivePopup.html b/doc/out/MessageMessageInteractivePopup.html index 55e683b..2eb8e87 100644 --- a/doc/out/MessageMessageInteractivePopup.html +++ b/doc/out/MessageMessageInteractivePopup.html @@ -1783,7 +1783,7 @@ like Popup, Message...

diff --git a/doc/out/Modal.html b/doc/out/Modal.html index 009eb17..3a16d4d 100644 --- a/doc/out/Modal.html +++ b/doc/out/Modal.html @@ -2336,7 +2336,7 @@ a string or a PIXI.Text object.

diff --git a/doc/out/ModalInteractivePopup.html b/doc/out/ModalInteractivePopup.html index 5d0489a..57ad45d 100644 --- a/doc/out/ModalInteractivePopup.html +++ b/doc/out/ModalInteractivePopup.html @@ -1783,7 +1783,7 @@ like Popup, Message...

diff --git a/doc/out/ModalModalInteractivePopup.html b/doc/out/ModalModalInteractivePopup.html index ae998eb..fed0040 100644 --- a/doc/out/ModalModalInteractivePopup.html +++ b/doc/out/ModalModalInteractivePopup.html @@ -1783,7 +1783,7 @@ like Popup, Message...

diff --git a/doc/out/PIXIApp.html b/doc/out/PIXIApp.html index 08c9ad2..97702ce 100644 --- a/doc/out/PIXIApp.html +++ b/doc/out/PIXIApp.html @@ -5737,7 +5737,7 @@ rejected with an error. diff --git a/doc/out/Popup.html b/doc/out/Popup.html index d1dbed6..4df70cc 100644 --- a/doc/out/Popup.html +++ b/doc/out/Popup.html @@ -2330,7 +2330,7 @@ a string, a number or a PIXI.Text object.

diff --git a/doc/out/PopupInteractivePopup.html b/doc/out/PopupInteractivePopup.html index 795df17..604c74b 100644 --- a/doc/out/PopupInteractivePopup.html +++ b/doc/out/PopupInteractivePopup.html @@ -1783,7 +1783,7 @@ like Popup, Message...

diff --git a/doc/out/PopupMenu.html b/doc/out/PopupMenu.html index b55cd44..ca6e439 100644 --- a/doc/out/PopupMenu.html +++ b/doc/out/PopupMenu.html @@ -2384,7 +2384,7 @@ a string, a number or a PIXI.Text object.

diff --git a/doc/out/PopupMenuPopupInteractivePopup.html b/doc/out/PopupMenuPopupInteractivePopup.html index 0dafa69..9b99a95 100644 --- a/doc/out/PopupMenuPopupInteractivePopup.html +++ b/doc/out/PopupMenuPopupInteractivePopup.html @@ -1783,7 +1783,7 @@ like Popup, Message...

diff --git a/doc/out/PopupMenuPopupMenuPopupInteractivePopup.html b/doc/out/PopupMenuPopupMenuPopupInteractivePopup.html index ace450a..d0a01e5 100644 --- a/doc/out/PopupMenuPopupMenuPopupInteractivePopup.html +++ b/doc/out/PopupMenuPopupMenuPopupInteractivePopup.html @@ -1783,7 +1783,7 @@ like Popup, Message...

diff --git a/doc/out/PopupMenuPopupMenuPopupPopupInteractivePopup.html b/doc/out/PopupMenuPopupMenuPopupPopupInteractivePopup.html index 2fa65d3..fa3de9b 100644 --- a/doc/out/PopupMenuPopupMenuPopupPopupInteractivePopup.html +++ b/doc/out/PopupMenuPopupMenuPopupPopupInteractivePopup.html @@ -1783,7 +1783,7 @@ like Popup, Message...

diff --git a/doc/out/PopupMenuPopupPopupInteractivePopup.html b/doc/out/PopupMenuPopupPopupInteractivePopup.html index 4a69b23..ba4305c 100644 --- a/doc/out/PopupMenuPopupPopupInteractivePopup.html +++ b/doc/out/PopupMenuPopupPopupInteractivePopup.html @@ -1783,7 +1783,7 @@ like Popup, Message...

diff --git a/doc/out/PopupPopupInteractivePopup.html b/doc/out/PopupPopupInteractivePopup.html index 19d9db2..db3d8c4 100644 --- a/doc/out/PopupPopupInteractivePopup.html +++ b/doc/out/PopupPopupInteractivePopup.html @@ -1783,7 +1783,7 @@ like Popup, Message...

diff --git a/doc/out/Progress.html b/doc/out/Progress.html index d9a0626..76aca61 100644 --- a/doc/out/Progress.html +++ b/doc/out/Progress.html @@ -2869,7 +2869,7 @@ app.scene.addChild(progress) diff --git a/doc/out/Scrollview.html b/doc/out/Scrollview.html index 1666dc8..c024568 100644 --- a/doc/out/Scrollview.html +++ b/doc/out/Scrollview.html @@ -1594,7 +1594,7 @@ app.loader
- scrollview.js:69 + scrollview.js:61
@@ -1701,7 +1701,7 @@ app.loader diff --git a/doc/out/Slider.html b/doc/out/Slider.html index fc5d4a1..84ab5f4 100644 --- a/doc/out/Slider.html +++ b/doc/out/Slider.html @@ -2960,7 +2960,7 @@ app.scene.addChild(slider) diff --git a/doc/out/Switch.html b/doc/out/Switch.html index cc0c1e1..4854327 100644 --- a/doc/out/Switch.html +++ b/doc/out/Switch.html @@ -3390,7 +3390,7 @@ app.scene.addChild(switch1) diff --git a/doc/out/TextLabel.TextLabel.html b/doc/out/TextLabel.TextLabel.html index 5ca8ee9..b66c0bc 100644 --- a/doc/out/TextLabel.TextLabel.html +++ b/doc/out/TextLabel.TextLabel.html @@ -1684,7 +1684,7 @@ diff --git a/doc/out/Theme.html b/doc/out/Theme.html index c42f2b4..4b4ba90 100644 --- a/doc/out/Theme.html +++ b/doc/out/Theme.html @@ -3159,7 +3159,7 @@ const app = new PIXIApp({ diff --git a/doc/out/ThemeDark.html b/doc/out/ThemeDark.html index e09c6b0..c5ff4c4 100644 --- a/doc/out/ThemeDark.html +++ b/doc/out/ThemeDark.html @@ -1580,7 +1580,7 @@ const app = new PIXIApp({ diff --git a/doc/out/ThemeLight.html b/doc/out/ThemeLight.html index d8d4cdb..f8f8cdc 100644 --- a/doc/out/ThemeLight.html +++ b/doc/out/ThemeLight.html @@ -1592,7 +1592,7 @@ const app = new PIXIApp({ diff --git a/doc/out/ThemeRed.html b/doc/out/ThemeRed.html index b58a87a..e44322c 100644 --- a/doc/out/ThemeRed.html +++ b/doc/out/ThemeRed.html @@ -1592,7 +1592,7 @@ const app = new PIXIApp({ diff --git a/doc/out/TileQuadNode.html b/doc/out/TileQuadNode.html index 812007a..b7d84e9 100644 --- a/doc/out/TileQuadNode.html +++ b/doc/out/TileQuadNode.html @@ -1472,7 +1472,7 @@ the memory pressure.

- image.js:278 + image.js:265
@@ -1676,7 +1676,7 @@ the memory pressure.

- image.js:321 + image.js:308
@@ -1844,7 +1844,7 @@ and west flags to address nw, ne, sw, and se.

- image.js:293 + image.js:280
@@ -1921,7 +1921,7 @@ an indicator of tiles to free.

- image.js:307 + image.js:294
@@ -2044,7 +2044,7 @@ an indicator of tiles to free.

diff --git a/doc/out/Tooltip.html b/doc/out/Tooltip.html index 683283f..f424668 100644 --- a/doc/out/Tooltip.html +++ b/doc/out/Tooltip.html @@ -2506,7 +2506,7 @@ a string, a number or a PIXI.Text object.

diff --git a/doc/out/UITest.html b/doc/out/UITest.html index c6d562e..7a8820b 100644 --- a/doc/out/UITest.html +++ b/doc/out/UITest.html @@ -4177,7 +4177,7 @@ test.start() diff --git a/doc/out/Volatile.html b/doc/out/Volatile.html index dd9d522..da507d2 100644 --- a/doc/out/Volatile.html +++ b/doc/out/Volatile.html @@ -2093,7 +2093,7 @@ app.scene.addChild(button) diff --git a/doc/out/global.html b/doc/out/global.html index 1fb3007..155d3d0 100644 --- a/doc/out/global.html +++ b/doc/out/global.html @@ -1655,7 +1655,7 @@
- button.js:8 + button.js:9
@@ -1943,7 +1943,7 @@
- button.js:24 + button.js:25
@@ -2231,7 +2231,7 @@
- button.js:16 + button.js:17
@@ -3314,7 +3314,7 @@ diff --git a/doc/out/index.html b/doc/out/index.html index 1938e1a..eab4b55 100644 --- a/doc/out/index.html +++ b/doc/out/index.html @@ -1467,7 +1467,6 @@ @@ -1480,7 +1479,7 @@ diff --git a/doc/out/pixi_abstractpopup.js.html b/doc/out/pixi_abstractpopup.js.html index 20b26d2..ecf57a9 100644 --- a/doc/out/pixi_abstractpopup.js.html +++ b/doc/out/pixi_abstractpopup.js.html @@ -1808,7 +1808,7 @@ export default class AbstractPopup extends PIXI.Graphics { diff --git a/doc/out/pixi_app.js.html b/doc/out/pixi_app.js.html index 7c3112b..07b8935 100644 --- a/doc/out/pixi_app.js.html +++ b/doc/out/pixi_app.js.html @@ -2179,7 +2179,7 @@ class FpsDisplay extends PIXI.Graphics { diff --git a/doc/out/pixi_badge.js.html b/doc/out/pixi_badge.js.html index 3ff085f..f9e7b50 100644 --- a/doc/out/pixi_badge.js.html +++ b/doc/out/pixi_badge.js.html @@ -1560,7 +1560,7 @@ export default class Badge extends AbstractPopup { diff --git a/doc/out/pixi_blurfilter.js.html b/doc/out/pixi_blurfilter.js.html index 9c65d14..fdeca0d 100644 --- a/doc/out/pixi_blurfilter.js.html +++ b/doc/out/pixi_blurfilter.js.html @@ -1714,7 +1714,7 @@ class TiltShiftYFilter extends TiltShiftAxisFilter { diff --git a/doc/out/pixi_button.js.html b/doc/out/pixi_button.js.html index 3613252..ee53060 100644 --- a/doc/out/pixi_button.js.html +++ b/doc/out/pixi_button.js.html @@ -1438,7 +1438,8 @@
-
import Theme from './theme.js'
+            
/* global PIXI TweenLite */
+import Theme from './theme.js'
 import Tooltip from './tooltip.js'
 import Badge from './badge.js'
 import Events from '../events.js'
@@ -1600,7 +1601,7 @@ export default class Button extends PIXI.Container {
         }
 
         if (this.opts.style === 'link') {
-            Object.assign(this.opts, {strokeAlpha: 0, strokeActiveAlpha: 0, fillAlpha: 0, fillActiveAlpha: 0})
+            Object.assign(this.opts, { strokeAlpha: 0, strokeActiveAlpha: 0, fillAlpha: 0, fillActiveAlpha: 0 })
         }
 
         this._active = null
@@ -1672,7 +1673,7 @@ export default class Button extends PIXI.Container {
         //-----------------
         this.button.on('pointerover', e => {
             this.capture(e)
-            TweenLite.to([this.button, this.content], this.theme.fast, {alpha: .83, overwrite: 'none'})
+            TweenLite.to([this.button, this.content], this.theme.fast, { alpha: .83, overwrite: 'none' })
         })
 
         this.button.on('pointermove', e => {
@@ -1681,12 +1682,13 @@ export default class Button extends PIXI.Container {
 
         this.button.on('pointerout', e => {
             this.capture(e)
-            TweenLite.to([this.button, this.content], this.theme.fast, {alpha: 1, overwrite: 'none'})
+            TweenLite.to([this.button, this.content], this.theme.fast, { alpha: 1, overwrite: 'none' })
         })
 
+        // eslint-disable-next-line no-unused-vars
         this.button.on('pointerdown', e => {
             //this.capture(e)
-            TweenLite.to([this.button, this.content], this.theme.fast, {alpha: .7, overwrite: 'none'})
+            TweenLite.to([this.button, this.content], this.theme.fast, { alpha: .7, overwrite: 'none' })
         })
 
         this.button.on('pointerup', e => {
@@ -1699,7 +1701,7 @@ export default class Button extends PIXI.Container {
                 this.opts.action.call(this, e, this)
             }
 
-            TweenLite.to([this.button, this.content], this.theme.fast, {alpha: .83, overwrite: 'none'})
+            TweenLite.to([this.button, this.content], this.theme.fast, { alpha: .83, overwrite: 'none' })
 
             if (this.opts.type === 'checkbox') {
                 this.active = !this.active
@@ -1722,9 +1724,9 @@ export default class Button extends PIXI.Container {
         //-----------------
         if (this.opts.tooltip) {
             if (typeof this.opts.tooltip === 'string') {
-                this.tooltip = new Tooltip({object: this, content: this.opts.tooltip})
+                this.tooltip = new Tooltip({ object: this, content: this.opts.tooltip })
             } else {
-                this.opts.tooltip = Object.assign({}, {object: this}, this.opts.tooltip)
+                this.opts.tooltip = Object.assign({}, { object: this }, this.opts.tooltip)
                 this.tooltip = new Tooltip(this.opts.tooltip)
             }
         }
@@ -1739,7 +1741,7 @@ export default class Button extends PIXI.Container {
                 offsetTop: 0
             })
             if (typeof this.opts.badge === 'string') {
-                opts = Object.assign(opts, {content: this.opts.badge})
+                opts = Object.assign(opts, { content: this.opts.badge })
             } else {
                 opts = Object.assign(opts, this.opts.badge)
             }
@@ -1747,25 +1749,25 @@ export default class Button extends PIXI.Container {
             const badge = new Badge(opts)
 
             switch (opts.align) {
-                case 'left':
-                    badge.x = this.x - badge.width / 2 + opts.offsetLeft
-                    break
-                case 'center':
-                    badge.x = this.x + this.width / 2 - badge.width / 2 + opts.offsetLeft
-                    break
-                case 'right':
-                    badge.x = this.x + this.width - badge.width / 2 + opts.offsetLeft
+            case 'left':
+                badge.x = this.x - badge.width / 2 + opts.offsetLeft
+                break
+            case 'center':
+                badge.x = this.x + this.width / 2 - badge.width / 2 + opts.offsetLeft
+                break
+            case 'right':
+                badge.x = this.x + this.width - badge.width / 2 + opts.offsetLeft
             }
 
             switch (opts.verticalAlign) {
-                case 'top':
-                    badge.y = this.y - badge.height / 2 + opts.offsetTop
-                    break
-                case 'middle':
-                    badge.y = this.y + this.height / 2 - badge.height / 2 + opts.offsetTop
-                    break
-                case 'bottom':
-                    badge.y = this.y + this.height - badge.height / 2 + opts.offsetTop
+            case 'top':
+                badge.y = this.y - badge.height / 2 + opts.offsetTop
+                break
+            case 'middle':
+                badge.y = this.y + this.height / 2 - badge.height / 2 + opts.offsetTop
+                break
+            case 'bottom':
+                badge.y = this.y + this.height - badge.height / 2 + opts.offsetTop
             }
 
             this.addChild(badge)
@@ -1875,15 +1877,15 @@ export default class Button extends PIXI.Container {
 
         for (let child of this.content.children) {
             switch (this.opts.verticalAlign) {
-                case 'top':
-                    child.y = 0
-                    break
-                case 'middle':
-                    child.y = this.content.height / 2 - child.height / 2
-                    break
-                case 'bottom':
-                    child.y = this.content.height - child.height
-                    break
+            case 'top':
+                child.y = 0
+                break
+            case 'middle':
+                child.y = this.content.height / 2 - child.height / 2
+                break
+            case 'bottom':
+                child.y = this.content.height - child.height
+                break
             }
         }
 
@@ -1900,27 +1902,27 @@ export default class Button extends PIXI.Container {
     layoutContent() {
 
         switch (this.opts.align) {
-            case 'left':
-                this.content.x = this.opts.padding
-                break
-            case 'center':
-                this.content.x = ((this._width - this.content.width) / 2)
-                break
-            case 'right':
-                this.content.x = this._width - this.opts.padding - this.content.width
-                break
+        case 'left':
+            this.content.x = this.opts.padding
+            break
+        case 'center':
+            this.content.x = ((this._width - this.content.width) / 2)
+            break
+        case 'right':
+            this.content.x = this._width - this.opts.padding - this.content.width
+            break
         }
 
         switch (this.opts.verticalAlign) {
-            case 'top':
-                this.content.y = this.opts.padding
-                break
-            case 'middle':
-                this.content.y = (this._height - this.content.height) / 2
-                break
-            case 'bottom':
-                this.content.y = this._height - this.opts.padding - this.content.height
-                break
+        case 'top':
+            this.content.y = this.opts.padding
+            break
+        case 'middle':
+            this.content.y = (this._height - this.content.height) / 2
+            break
+        case 'bottom':
+            this.content.y = this._height - this.opts.padding - this.content.height
+            break
         }
 
         return this
@@ -2118,7 +2120,7 @@ export default class Button extends PIXI.Container {
 
         
diff --git a/doc/out/pixi_buttongroup.js.html b/doc/out/pixi_buttongroup.js.html index adea7c7..8ffcf70 100644 --- a/doc/out/pixi_buttongroup.js.html +++ b/doc/out/pixi_buttongroup.js.html @@ -1797,7 +1797,7 @@ export default class ButtonGroup extends PIXI.Graphics {
diff --git a/doc/out/pixi_deepzoom_image.js.html b/doc/out/pixi_deepzoom_image.js.html index 06f8d26..0ba14a4 100644 --- a/doc/out/pixi_deepzoom_image.js.html +++ b/doc/out/pixi_deepzoom_image.js.html @@ -1440,26 +1440,13 @@
import { Capabilities } from '../../capabilities.js'
 import { Points } from '../../utils.js'
-import { deepZoomTileCache } from './tile.js'
+import Tile from './tile.js'
 import { Tiles } from './tiles.js'
 
 function isEven(n) {
     return n % 2 == 0
 }
 
-
-function printTileCacheInfos() {
-    let references = new Map()
-    let multiples = 0
-    for (let [url, tiles] of deepZoomTileCache.entries()) {
-        let count = tiles.size
-        references.set(url, count)
-        if (count > 1) {
-            multiples += 1
-        }
-    }
-    console.log({ multiples, references })
-}
 /**
  * A utility class that holds information typically provided by DZI files, i.e.
  * height and width of the overall image, overlap, and image type.
@@ -1797,7 +1784,7 @@ export class DeepZoomImage extends PIXI.Container {
             world = null,               // Defines the world bounds the images lives in
             highResolution = true,
             autoLoadTiles = true,
-            preferWorker = false,
+            useWorker = '',
             minimumLevel = 0,
             alpha = 1,
             app = window.app
@@ -1808,12 +1795,13 @@ export class DeepZoomImage extends PIXI.Container {
         this.debug = debug
         this.shadow = shadow
         this.world = world
-        this.preferWorker = preferWorker
+        this.useWorker = useWorker
         this.resolution = highResolution
             ? Math.round(window.devicePixelRatio)
             : 1
         this.alpha = alpha
         this.fastLoads = 0
+        this.active = true
         this.autoLoadTiles = autoLoadTiles
         this.minimumLevel = minimumLevel
         this.quadTrees = new Map() // url as keys, TileQuadNodes as values
@@ -2085,9 +2073,9 @@ export class DeepZoomImage extends PIXI.Container {
     }
 
     worldBounds() {
-        let viewBounds = this.app.scene.bounds
+        let viewBounds = this.app.scene.bounds || this.app.scene.getBounds() 
         // Using getBounds extends visible scope after loading tiles and leads
-        // to excessive loading
+        // to excessive loading. So we prefer bounds over getBounds()
         if (this.world != null) {
             let bounds = this.world.bounds
             let x = Math.max(-bounds.width, bounds.x)
@@ -2467,6 +2455,9 @@ export class DeepZoomImage extends PIXI.Container {
      * @param {boolean} debug - log debug infos
      */
     transformed(event) {
+        if (!this.active) {
+            return
+        }
         let key = this.currentLevel.toString()
         let currentTiles = this.tileLayers[key]
         if (typeof currentTiles == 'undefined') {
@@ -2489,7 +2480,7 @@ export class DeepZoomImage extends PIXI.Container {
             this.ensureTiles(this.currentLevel, event.about)
             return
         }
-        
+
         let level = this.levelForScale(event.scale)
         let newLevel = Math.max(level, this.minimumLevel)
         if (newLevel != this.currentLevel) {
@@ -2514,6 +2505,7 @@ export class DeepZoomImage extends PIXI.Container {
    * @memberof DeepZoomImage
    */
     activate() {
+        this.active = true
         this.destroyTilesAboveLevel(this.currentLevel)
         this.ensureTiles(this.currentLevel, null)
         //console.log("Activate Textures!", this.currentLevel)
@@ -2525,35 +2517,19 @@ export class DeepZoomImage extends PIXI.Container {
    * @memberof DeepZoomImage
    */
     deactivate() {
+        this.active = false
         this.destroyAllTiles()
-        Object.keys(this.tileLayers).forEach(key => {
-            this.destroyTiles(key)
-        })
         this.tileContainer.destroy({ children: true })
-        printTileCacheInfos()
     }
 
     throwFinished() {
-        console.log("throwFinished")
+        //console.log("throwFinished")
         let key = this.currentLevel.toString()
         let currentTiles = this.tileLayers[key]
         if (typeof currentTiles == 'undefined') {
             return
         }
-
         this.ensureTiles(this.currentLevel)
-        // let all = new Set()
-        // for (let tile of currentTiles.children) {
-        //     all.add(tile.url)
-        // }
-        // let { centerCol, centerRow, needed } = this.neededTiles(currentTiles, this.currentLevel)
-        // for (let [url, col, row] of needed) {
-        //     all.delete(url)
-        // }
-        // for (let url of all) {
-        //     currentTiles.destroyTileByUrl(url)
-        // }
-        // currentTiles.loader.loader.reset()
     }
 }
 
@@ -2569,7 +2545,7 @@ export class DeepZoomImage extends PIXI.Container {
diff --git a/doc/out/pixi_flippable.js.html b/doc/out/pixi_flippable.js.html index b6dc3a8..c2731db 100644 --- a/doc/out/pixi_flippable.js.html +++ b/doc/out/pixi_flippable.js.html @@ -1496,7 +1496,7 @@ export default class Flippable extends PIXI.projection.Camera3d { * @param {boolean} [opts.shadow=false] - Should be a shadow been display during the animation? * @param {numer} [opts.eulerX=0] - The shift of the x-axis during the animation. * @param {numer} [opts.eulerY=0] - The shift of the y-axis during the animation. - * @param {GSAP.Ease} [opts.eulerEase=Sine.easeOut] - The ease of the shift. + * @param {GSAP.Ease} [opts.eulerEase=Power1.easeOut] - The ease of the shift. * @param {boolean} [opts.useBackTransforms=false] - When set to true, the flip animation also animates to the transform parameters of the back-object. * @param {GSAP.Ease} [opts.transformEase=Power2.easeOut] - The ease of the transform. * @param {numer} [opts.focus=800] - The value of the focus of the 3D camera (see pixi-projection). @@ -1520,7 +1520,7 @@ export default class Flippable extends PIXI.projection.Camera3d { shadow: false, eulerX: 0, eulerY: 0, - eulerEase: Sine.easeOut, + eulerEase: Power1.easeOut, useBackTransforms: false, transformEase: Power2.easeOut, focus: 800, @@ -1892,7 +1892,7 @@ export default class Flippable extends PIXI.projection.Camera3d {
diff --git a/doc/out/pixi_labeledgraphics.js.html b/doc/out/pixi_labeledgraphics.js.html index 74db136..b73fab7 100644 --- a/doc/out/pixi_labeledgraphics.js.html +++ b/doc/out/pixi_labeledgraphics.js.html @@ -1865,7 +1865,7 @@ export class BitmapLabeledGraphics extends LabeledGraphics {
diff --git a/doc/out/pixi_list.js.html b/doc/out/pixi_list.js.html index 865a183..51e3b2c 100644 --- a/doc/out/pixi_list.js.html +++ b/doc/out/pixi_list.js.html @@ -1832,7 +1832,7 @@ export default class List extends PIXI.Container {
diff --git a/doc/out/pixi_message.js.html b/doc/out/pixi_message.js.html index a52b067..f32a385 100644 --- a/doc/out/pixi_message.js.html +++ b/doc/out/pixi_message.js.html @@ -1577,7 +1577,7 @@ export default class Message extends InteractivePopup {
diff --git a/doc/out/pixi_modal.js.html b/doc/out/pixi_modal.js.html index 01655f5..81edddf 100644 --- a/doc/out/pixi_modal.js.html +++ b/doc/out/pixi_modal.js.html @@ -1652,7 +1652,7 @@ export default class Modal extends PIXI.Container {
diff --git a/doc/out/pixi_popup.js.html b/doc/out/pixi_popup.js.html index 5580af4..3d0a07a 100644 --- a/doc/out/pixi_popup.js.html +++ b/doc/out/pixi_popup.js.html @@ -1664,7 +1664,7 @@ export default class Popup extends InteractivePopup {
diff --git a/doc/out/pixi_popupmenu.js.html b/doc/out/pixi_popupmenu.js.html index 2f49bf9..5aac331 100644 --- a/doc/out/pixi_popupmenu.js.html +++ b/doc/out/pixi_popupmenu.js.html @@ -1565,7 +1565,7 @@ export default class PopupMenu extends Popup {
diff --git a/doc/out/pixi_progress.js.html b/doc/out/pixi_progress.js.html index 7f6bd6f..3099c33 100644 --- a/doc/out/pixi_progress.js.html +++ b/doc/out/pixi_progress.js.html @@ -1754,7 +1754,7 @@ export default class Progress extends PIXI.Container {
diff --git a/doc/out/pixi_scrollview.js.html b/doc/out/pixi_scrollview.js.html index 40caec2..e8953a9 100644 --- a/doc/out/pixi_scrollview.js.html +++ b/doc/out/pixi_scrollview.js.html @@ -1478,14 +1478,6 @@ export default class Scrollview extends Scrollbox { super(opts) this.opts = opts - - // setup - //----------------- - this.setup() - - // layout - //----------------- - this.layout() } /** @@ -1524,7 +1516,7 @@ export default class Scrollview extends Scrollbox {
diff --git a/doc/out/pixi_slider.js.html b/doc/out/pixi_slider.js.html index e32b398..65ece88 100644 --- a/doc/out/pixi_slider.js.html +++ b/doc/out/pixi_slider.js.html @@ -1922,7 +1922,7 @@ export default class Slider extends PIXI.Container {
diff --git a/doc/out/pixi_switch.js.html b/doc/out/pixi_switch.js.html index e0357d2..b3c5c5c 100644 --- a/doc/out/pixi_switch.js.html +++ b/doc/out/pixi_switch.js.html @@ -1959,7 +1959,7 @@ export default class Switch extends PIXI.Container {
diff --git a/doc/out/pixi_theme.js.html b/doc/out/pixi_theme.js.html index aa989be..213871b 100644 --- a/doc/out/pixi_theme.js.html +++ b/doc/out/pixi_theme.js.html @@ -1687,7 +1687,7 @@ export class ThemeRed extends Theme {
diff --git a/doc/out/pixi_tooltip.js.html b/doc/out/pixi_tooltip.js.html index f1e4a43..2002845 100644 --- a/doc/out/pixi_tooltip.js.html +++ b/doc/out/pixi_tooltip.js.html @@ -1606,7 +1606,7 @@ export default class Tooltip extends AbstractPopup {
diff --git a/doc/out/pixi_volatile.js.html b/doc/out/pixi_volatile.js.html index 17f5abd..ee775f9 100644 --- a/doc/out/pixi_volatile.js.html +++ b/doc/out/pixi_volatile.js.html @@ -1612,7 +1612,7 @@ export default class Volatile {
diff --git a/doc/out/uitest.js.html b/doc/out/uitest.js.html index a3fda1f..306ffae 100644 --- a/doc/out/uitest.js.html +++ b/doc/out/uitest.js.html @@ -2355,8 +2355,8 @@ class Event { // MouseEvent const mouseEventOpts = { - screenX: window.screenX + target.offsetLeft + position.x, - screenY: window.screenY + target.offsetTop + position.y, + screenX: window.screenX + (target.offsetLeft || 0) + position.x, + screenY: window.screenY + (target.offsetTop || 0) + position.y, clientX: rect.x + position.x, clientY: rect.y + position.y, ctrlKey: false, @@ -2416,7 +2416,7 @@ class Event { diff --git a/lib/uitest.js b/lib/uitest.js index d40b010..342ab7e 100644 --- a/lib/uitest.js +++ b/lib/uitest.js @@ -915,8 +915,8 @@ class Event { // MouseEvent const mouseEventOpts = { - screenX: window.screenX + target.offsetLeft + position.x, - screenY: window.screenY + target.offsetTop + position.y, + screenX: window.screenX + (target.offsetLeft || 0) + position.x, + screenY: window.screenY + (target.offsetTop || 0) + position.y, clientX: rect.x + position.x, clientY: rect.y + position.y, ctrlKey: false, diff --git a/package-lock.json b/package-lock.json index a22b15d..89f3cdf 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1481,7 +1481,8 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -1502,12 +1503,14 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -1522,17 +1525,20 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -1649,7 +1655,8 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -1661,6 +1668,7 @@ "version": "1.0.0", "bundled": true, "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -1675,6 +1683,7 @@ "version": "3.0.4", "bundled": true, "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -1682,12 +1691,14 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -1706,6 +1717,7 @@ "version": "0.5.1", "bundled": true, "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -1786,7 +1798,8 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -1798,6 +1811,7 @@ "version": "1.4.0", "bundled": true, "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -1883,7 +1897,8 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -1919,6 +1934,7 @@ "version": "1.0.2", "bundled": true, "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -1938,6 +1954,7 @@ "version": "3.0.1", "bundled": true, "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -1981,12 +1998,14 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true + "dev": true, + "optional": true } } }, @@ -2492,11 +2511,11 @@ "dev": true }, "https-proxy-agent": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz", - "integrity": "sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz", + "integrity": "sha512-c8Ndjc9Bkpfx/vCJueCPy0jlP4ccCCSNDp8xwCZzPjKJUm+B+u9WX2x98Qx4n1PiMNTWo3D7KK5ifNV/yJyRzg==", "requires": { - "agent-base": "^4.1.0", + "agent-base": "^4.3.0", "debug": "^3.1.0" }, "dependencies": { @@ -3431,9 +3450,9 @@ "integrity": "sha1-i0tcQzsx5Bm8N53FZc4bg1qRs3I=" }, "pixi-particles": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/pixi-particles/-/pixi-particles-4.1.1.tgz", - "integrity": "sha512-R/vnqXzD2X4v4mSi3zJE81i1vGWaaZSDI/ImaZr8G4E0qBq2+OxB97Kb9WVWd7BlLFj4wR09VGKm7e5sQGQy4Q==" + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/pixi-particles/-/pixi-particles-4.1.2.tgz", + "integrity": "sha512-+b8p39fMPE3dtjCSJxxlZTzvJZfEgkPa8HupBMAOV2SrwYsgEK6DnThOVIzya75Iii/02jRUDhJ1zBg0j+qQZA==" }, "pixi-projection": { "version": "0.2.8",