- 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",