Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Commit 4a38c1a

Browse files
committed
refactor($compile): remove skipDestroyOnNextJQueryCleanData, remove jq data of all replaced nodes
1 parent 78b4b63 commit 4a38c1a

File tree

4 files changed

+28
-36
lines changed

4 files changed

+28
-36
lines changed

src/.jshintrc

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,6 @@
9494
"VALIDITY_STATE_PROPERTY": false,
9595
"reloadWithDebugInfo": false,
9696

97-
"skipDestroyOnNextJQueryCleanData": true,
98-
9997
"NODE_TYPE_ELEMENT": false,
10098
"NODE_TYPE_ATTRIBUTE": false,
10199
"NODE_TYPE_TEXT": false,

src/Angular.js

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1678,7 +1678,6 @@ function snake_case(name, separator) {
16781678
}
16791679

16801680
var bindJQueryFired = false;
1681-
var skipDestroyOnNextJQueryCleanData;
16821681
function bindJQuery() {
16831682
var originalCleanData;
16841683

@@ -1712,15 +1711,11 @@ function bindJQuery() {
17121711
originalCleanData = jQuery.cleanData;
17131712
jQuery.cleanData = function(elems) {
17141713
var events;
1715-
if (!skipDestroyOnNextJQueryCleanData) {
1716-
for (var i = 0, elem; (elem = elems[i]) != null; i++) {
1717-
events = jQuery._data(elem, "events");
1718-
if (events && events.$destroy) {
1719-
jQuery(elem).triggerHandler('$destroy');
1720-
}
1714+
for (var i = 0, elem; (elem = elems[i]) != null; i++) {
1715+
events = jQuery._data(elem, "events");
1716+
if (events && events.$destroy) {
1717+
jQuery(elem).triggerHandler('$destroy');
17211718
}
1722-
} else {
1723-
skipDestroyOnNextJQueryCleanData = false;
17241719
}
17251720
originalCleanData(elems);
17261721
};

src/jqLite.js

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,12 @@ function jqLiteHasData(node) {
189189
return false;
190190
}
191191

192+
function jqLiteCleanData(nodes) {
193+
for (var i = 0, ii = nodes.length; i < ii; i++) {
194+
jqLiteRemoveData(nodes[i]);
195+
}
196+
}
197+
192198
function jqLiteBuildFragment(html, context) {
193199
var tmp, tag, wrap,
194200
fragment = context.createDocumentFragment(),
@@ -571,7 +577,8 @@ function getAliasedAttrName(name) {
571577
forEach({
572578
data: jqLiteData,
573579
removeData: jqLiteRemoveData,
574-
hasData: jqLiteHasData
580+
hasData: jqLiteHasData,
581+
cleanData: jqLiteCleanData
575582
}, function(fn, name) {
576583
JQLite[name] = fn;
577584
});

src/ng/compile.js

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2634,41 +2634,33 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
26342634
parent.replaceChild(newNode, firstElementToRemove);
26352635
}
26362636

2637-
// TODO(perf): what's this document fragment for? is it needed? can we at least reuse it?
2637+
// Append all the `elementsToRemove` to a fragment. This will...
2638+
// - remove them from the DOM
2639+
// - allow them to still be traversed with .nextSibling
2640+
// - allow a single fragment.qSA to fetch all elements being removed
26382641
var fragment = document.createDocumentFragment();
2639-
fragment.appendChild(firstElementToRemove);
2642+
for (i = 0; i < removeCount; i++) {
2643+
fragment.appendChild(elementsToRemove[i]);
2644+
}
26402645

26412646
if (jqLite.hasData(firstElementToRemove)) {
26422647
// Copy over user data (that includes Angular's $scope etc.). Don't copy private
26432648
// data here because there's no public interface in jQuery to do that and copying over
26442649
// event listeners (which is the main use of private data) wouldn't work anyway.
26452650
jqLite.data(newNode, jqLite.data(firstElementToRemove));
26462651

2647-
// Remove data of the replaced element. We cannot just call .remove()
2648-
// on the element it since that would deallocate scope that is needed
2649-
// for the new node. Instead, remove the data "manually".
2650-
if (!jQuery) {
2651-
delete jqLite.cache[firstElementToRemove[jqLite.expando]];
2652-
} else {
2653-
// jQuery 2.x doesn't expose the data storage. Use jQuery.cleanData to clean up after
2654-
// the replaced element. The cleanData version monkey-patched by Angular would cause
2655-
// the scope to be trashed and we do need the very same scope to work with the new
2656-
// element. However, we cannot just cache the non-patched version and use it here as
2657-
// that would break if another library patches the method after Angular does (one
2658-
// example is jQuery UI). Instead, set a flag indicating scope destroying should be
2659-
// skipped this one time.
2660-
skipDestroyOnNextJQueryCleanData = true;
2661-
jQuery.cleanData([firstElementToRemove]);
2662-
}
2652+
// Remove $destroy event listeners from `firstElementToRemove`
2653+
jqLite(firstElementToRemove).off('$destroy');
26632654
}
26642655

2665-
for (var k = 1, kk = elementsToRemove.length; k < kk; k++) {
2666-
var element = elementsToRemove[k];
2667-
jqLite(element).remove(); // must do this way to clean up expando
2668-
fragment.appendChild(element);
2669-
delete elementsToRemove[k];
2670-
}
2656+
// Cleanup any data/listeners on the elements and children.
2657+
// This includes invoking the $destroy event on any elements with listeners.
2658+
jqLite.cleanData(fragment.querySelectorAll('*'));
26712659

2660+
// Update the jqLite collection to only contain the `newNode`
2661+
for (i = 1; i < removeCount; i++) {
2662+
delete elementsToRemove[i];
2663+
}
26722664
elementsToRemove[0] = newNode;
26732665
elementsToRemove.length = 1;
26742666
}

0 commit comments

Comments
 (0)