|
1 | 1 | import { camelCase } from '../../util/utilHelpers.mjs';
|
2 | 2 | import $ from './Dom.mjs';
|
3 | 3 | import V from '../../V/index.mjs';
|
4 |
| -import { dataPriv, cleanNodesData } from './vars.mjs'; |
| 4 | +import { dataPriv, dataUser } from './vars.mjs'; |
5 | 5 |
|
6 | 6 | // Manipulation
|
7 | 7 |
|
8 |
| -function removeNodes(nodes, removeData) { |
| 8 | +function cleanNodesData(nodes) { |
| 9 | + let i = nodes.length; |
| 10 | + while (i--) cleanNodeData(nodes[i]); |
| 11 | +} |
| 12 | + |
| 13 | +function cleanNodeData(node) { |
| 14 | + $.event.remove(node); |
| 15 | + dataPriv.remove(node); |
| 16 | + dataUser.remove(node); |
| 17 | +} |
| 18 | + |
| 19 | +function removeNodes(nodes) { |
9 | 20 | for (let i = 0; i < nodes.length; i++) {
|
10 | 21 | const node = nodes[i];
|
11 |
| - removeData && dataPriv.remove(node); |
12 | 22 | if (node.parentNode) {
|
13 | 23 | node.parentNode.removeChild(node);
|
14 | 24 | }
|
15 | 25 | }
|
16 | 26 | }
|
17 | 27 |
|
18 | 28 | export function remove() {
|
19 |
| - removeNodes(this, true); |
| 29 | + for (let i = 0; i < this.length; i++) { |
| 30 | + const node = this[i]; |
| 31 | + cleanNodeData(node); |
| 32 | + cleanNodesData(node.getElementsByTagName('*')); |
| 33 | + } |
| 34 | + removeNodes(this); |
20 | 35 | return this;
|
21 | 36 | }
|
22 | 37 |
|
23 | 38 | export function detach() {
|
24 |
| - removeNodes(this, false); |
| 39 | + removeNodes(this); |
25 | 40 | return this;
|
26 | 41 | }
|
27 | 42 |
|
28 | 43 | export function empty() {
|
29 | 44 | for (let i = 0; i < this.length; i++) {
|
30 | 45 | const node = this[i];
|
31 | 46 | if (node.nodeType === 1) {
|
32 |
| - cleanNodesData(dataPriv, node.getElementsByTagName('*')); |
| 47 | + cleanNodesData(node.getElementsByTagName('*')); |
33 | 48 | // Remove any remaining nodes
|
34 | 49 | node.textContent = '';
|
35 | 50 | }
|
|
0 commit comments