Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 24 additions & 19 deletions app/code/Magento/Ui/view/base/web/js/lib/view/utils/dom-observer.js
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ define([
*/
function processAdded(node) {
_.each(watchers.selectors, function (listeners, selector) {
listeners.forEach(function (data) {
for (let data of listeners) {
if (!data.ctx.contains(node) || !$(node, data.ctx).is(selector)) {
return;
}
Expand All @@ -157,7 +157,7 @@ define([
} else if (data.type === 'remove') {
addRemovalListener(node, data);
}
});
}
});
}

Expand All @@ -170,14 +170,14 @@ define([
var nodeData = getNodeData(node),
listeners = nodeData && nodeData.remove;


if (!listeners) {
return;
}

listeners.forEach(function (data) {
for (let data of listeners) {
trigger(node, data);
});

}
removeNodeData(node);
}

Expand All @@ -194,12 +194,12 @@ define([

nodes = _.toArray(nodes).filter(isElementNode);

nodes.forEach(function (node) {
for (let node of nodes) {
result.push(node);

children = extractChildren(node);
result = result.concat(children);
});
result.push(...children);
}

return result;
}
Expand All @@ -216,10 +216,10 @@ define([
var removed = [],
added = [];

mutations.forEach(function (record) {
removed = removed.concat(_.toArray(record.removedNodes));
added = added.concat(_.toArray(record.addedNodes));
});
for (let record of mutations) {
removed.push(...record.removedNodes);
added.push(...record.addedNodes);
}

removed = removed.filter(function (node) {
var addIndex = added.indexOf(node),
Expand Down Expand Up @@ -285,10 +285,16 @@ define([
var changes;

if (shouldObserveMutations(mutations)) {
let node;

changes = formChangesLists(mutations);

changes.removed.forEach(processRemoved);
changes.added.forEach(processAdded);
for (node of changes.removed) {
processRemoved(node);
}
for (node of changes.added) {
processAdded(node);
}
}
});

Expand Down Expand Up @@ -331,10 +337,9 @@ define([

nodes = $(selector, data.ctx).toArray();

nodes.forEach(function (node) {
for (let node of nodes) {
trigger(node, data);
});

}
addSelectorListener(selector, data);
},

Expand Down Expand Up @@ -366,9 +371,9 @@ define([
addSelectorListener(selector, data);
}

nodes.forEach(function (node) {
for (let node of nodes) {
addRemovalListener(node, data);
});
}
},

/**
Expand Down