Merge branch 'master' of gitea.iwm-tuebingen.de:IWMBrowser/iwmlib
# Conflicts: # lib/scatter.js
This commit is contained in:
commit
c55644558a
20
dist/iwmlib.js
vendored
20
dist/iwmlib.js
vendored
@ -3325,15 +3325,22 @@
|
||||
}
|
||||
|
||||
close() {
|
||||
this._callCloseCallbacks();
|
||||
this._removeSelfFromScatterContainer();
|
||||
}
|
||||
|
||||
_callCloseCallbacks() {
|
||||
if (this.onClose) {
|
||||
this.onClose.forEach(callback => callback(this));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
_removeSelfFromScatterContainer() {
|
||||
/**
|
||||
Removes self from container when it's closed.
|
||||
*/
|
||||
if (this.container) {
|
||||
this.container.remove(this);
|
||||
}
|
||||
if (this.container) {
|
||||
this.container.remove(this);
|
||||
}
|
||||
}
|
||||
|
||||
@ -3930,7 +3937,10 @@
|
||||
* @memberof DOMScatterContainer
|
||||
*/
|
||||
remove(scatter) {
|
||||
this.scatter.delete(scatter.element);
|
||||
const element = scatter.element;
|
||||
if (!this.scatter.has(element)) console.warn(`Try removing element that is not in the scatter.`, element);
|
||||
|
||||
this.scatter.delete(element);
|
||||
}
|
||||
|
||||
/**
|
||||
|
15
dist/iwmlib.pixi.js
vendored
15
dist/iwmlib.pixi.js
vendored
@ -6771,15 +6771,22 @@
|
||||
}
|
||||
|
||||
close() {
|
||||
this._callCloseCallbacks();
|
||||
this._removeSelfFromScatterContainer();
|
||||
}
|
||||
|
||||
_callCloseCallbacks() {
|
||||
if (this.onClose) {
|
||||
this.onClose.forEach(callback => callback(this));
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
_removeSelfFromScatterContainer() {
|
||||
/**
|
||||
Removes self from container when it's closed.
|
||||
*/
|
||||
if (this.container) {
|
||||
this.container.remove(this);
|
||||
}
|
||||
if (this.container) {
|
||||
this.container.remove(this);
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user