Merge branch 'master' of gitea.iwm-tuebingen.de:IWMBrowser/iwmlib

# Conflicts:
#	lib/scatter.js
This commit is contained in:
Sebastian Kupke 2019-07-30 17:02:58 +02:00
commit c55644558a
2 changed files with 26 additions and 9 deletions

14
dist/iwmlib.js vendored
View File

@ -3325,9 +3325,17 @@
}
close() {
this._callCloseCallbacks();
this._removeSelfFromScatterContainer();
}
_callCloseCallbacks() {
if (this.onClose) {
this.onClose.forEach(callback => callback(this));
}
}
_removeSelfFromScatterContainer() {
/**
Removes self from container when it's closed.
*/
@ -3335,7 +3343,6 @@
this.container.remove(this);
}
}
}
gesture(interaction) {
let delta = interaction.delta();
@ -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);
}
/**

9
dist/iwmlib.pixi.js vendored
View File

@ -6771,9 +6771,17 @@
}
close() {
this._callCloseCallbacks();
this._removeSelfFromScatterContainer();
}
_callCloseCallbacks() {
if (this.onClose) {
this.onClose.forEach(callback => callback(this));
}
}
_removeSelfFromScatterContainer() {
/**
Removes self from container when it's closed.
*/
@ -6781,7 +6789,6 @@
this.container.remove(this);
}
}
}
gesture(interaction) {
let delta = interaction.delta();