Merged conflicts.
This commit is contained in:
parent
c55644558a
commit
73342a0506
@ -3,7 +3,8 @@
|
|||||||
"ecmaVersion": 10,
|
"ecmaVersion": 10,
|
||||||
"sourceType": "module",
|
"sourceType": "module",
|
||||||
"ecmaFeatures": {
|
"ecmaFeatures": {
|
||||||
"impliedStrict": true
|
"impliedStrict": true,
|
||||||
|
"modules": true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"env": {
|
"env": {
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
/* eslint-disable no-unused-vars */
|
/* eslint-disable no-unused-vars */
|
||||||
/* eslint-disable no-console */
|
/* eslint-disable no-console */
|
||||||
/* globals TweenLite debugCanvas */
|
/* globals debugCanvas */
|
||||||
import Interface from './interface.js'
|
import Interface from './interface.js'
|
||||||
import { Points, Polygon, Angle, Elements, LowPassFilter } from './utils.js'
|
import { Points, Polygon, Angle, Elements, LowPassFilter } from './utils.js'
|
||||||
import Events from './events.js'
|
import Events from './events.js'
|
||||||
@ -351,17 +351,22 @@ export class AbstractScatter extends Throwable {
|
|||||||
}
|
}
|
||||||
|
|
||||||
close() {
|
close() {
|
||||||
|
this._callCloseCallbacks()
|
||||||
|
this._removeSelfFromScatterContainer()
|
||||||
|
}
|
||||||
|
|
||||||
|
_callCloseCallbacks() {
|
||||||
if (this.onClose) {
|
if (this.onClose) {
|
||||||
this.onClose.forEach(callback => callback(this))
|
this.onClose.forEach(callback => callback(this))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
_removeSelfFromScatterContainer() {
|
||||||
Removes self from container when it's closed.
|
// Removes self from container when it's closed.
|
||||||
*/
|
|
||||||
if (this.container) {
|
if (this.container) {
|
||||||
this.container.remove(this)
|
this.container.remove(this)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
gesture(interaction) {
|
gesture(interaction) {
|
||||||
let delta = interaction.delta()
|
let delta = interaction.delta()
|
||||||
|
Loading…
Reference in New Issue
Block a user