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

Commit 2d6a498

Browse files
committed
refactor($compile): remove skipDestroyOnNextJQueryCleanData, remove jq data of all replaced nodes
1 parent 860832e commit 2d6a498

File tree

4 files changed

+28
-36
lines changed

4 files changed

+28
-36
lines changed

src/.jshintrc

-2
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

+4-9
Original file line numberDiff line numberDiff line change
@@ -1661,7 +1661,6 @@ function snake_case(name, separator) {
16611661
}
16621662

16631663
var bindJQueryFired = false;
1664-
var skipDestroyOnNextJQueryCleanData;
16651664
function bindJQuery() {
16661665
var originalCleanData;
16671666

@@ -1696,15 +1695,11 @@ function bindJQuery() {
16961695
originalCleanData = jQuery.cleanData;
16971696
jQuery.cleanData = function(elems) {
16981697
var events;
1699-
if (!skipDestroyOnNextJQueryCleanData) {
1700-
for (var i = 0, elem; (elem = elems[i]) != null; i++) {
1701-
events = jQuery._data(elem, "events");
1702-
if (events && events.$destroy) {
1703-
jQuery(elem).triggerHandler('$destroy');
1704-
}
1698+
for (var i = 0, elem; (elem = elems[i]) != null; i++) {
1699+
events = jQuery._data(elem, "events");
1700+
if (events && events.$destroy) {
1701+
jQuery(elem).triggerHandler('$destroy');
17051702
}
1706-
} else {
1707-
skipDestroyOnNextJQueryCleanData = false;
17081703
}
17091704
originalCleanData(elems);
17101705
};

src/jqLite.js

+8-1
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(),
@@ -564,7 +570,8 @@ function getAliasedAttrName(element, name) {
564570
forEach({
565571
data: jqLiteData,
566572
removeData: jqLiteRemoveData,
567-
hasData: jqLiteHasData
573+
hasData: jqLiteHasData,
574+
cleanData: jqLiteCleanData
568575
}, function(fn, name) {
569576
JQLite[name] = fn;
570577
});

src/ng/compile.js

+16-24
Original file line numberDiff line numberDiff line change
@@ -2501,41 +2501,33 @@ function $CompileProvider($provide, $$sanitizeUriProvider) {
25012501
parent.replaceChild(newNode, firstElementToRemove);
25022502
}
25032503

2504-
// TODO(perf): what's this document fragment for? is it needed? can we at least reuse it?
2504+
// Append all the `elementsToRemove` to a fragment. This will...
2505+
// - remove them from the DOM
2506+
// - allow them to still be traversed with .nextSibling
2507+
// - allow a single fragment.qSA to fetch all elements being removed
25052508
var fragment = document.createDocumentFragment();
2506-
fragment.appendChild(firstElementToRemove);
2509+
for (i = 0; i < removeCount; i++) {
2510+
fragment.appendChild(elementsToRemove[i]);
2511+
}
25072512

25082513
if (jqLite.hasData(firstElementToRemove)) {
25092514
// Copy over user data (that includes Angular's $scope etc.). Don't copy private
25102515
// data here because there's no public interface in jQuery to do that and copying over
25112516
// event listeners (which is the main use of private data) wouldn't work anyway.
25122517
jqLite(newNode).data(jqLite(firstElementToRemove).data());
25132518

2514-
// Remove data of the replaced element. We cannot just call .remove()
2515-
// on the element it since that would deallocate scope that is needed
2516-
// for the new node. Instead, remove the data "manually".
2517-
if (!jQuery) {
2518-
delete jqLite.cache[firstElementToRemove[jqLite.expando]];
2519-
} else {
2520-
// jQuery 2.x doesn't expose the data storage. Use jQuery.cleanData to clean up after
2521-
// the replaced element. The cleanData version monkey-patched by Angular would cause
2522-
// the scope to be trashed and we do need the very same scope to work with the new
2523-
// element. However, we cannot just cache the non-patched version and use it here as
2524-
// that would break if another library patches the method after Angular does (one
2525-
// example is jQuery UI). Instead, set a flag indicating scope destroying should be
2526-
// skipped this one time.
2527-
skipDestroyOnNextJQueryCleanData = true;
2528-
jQuery.cleanData([firstElementToRemove]);
2529-
}
2519+
// Remove $destroy event listeners from `firstElementToRemove`
2520+
jqLite(firstElementToRemove).off('$destroy');
25302521
}
25312522

2532-
for (var k = 1, kk = elementsToRemove.length; k < kk; k++) {
2533-
var element = elementsToRemove[k];
2534-
jqLite(element).remove(); // must do this way to clean up expando
2535-
fragment.appendChild(element);
2536-
delete elementsToRemove[k];
2537-
}
2523+
// Cleanup any data/listeners on the elements and children.
2524+
// This includes invoking the $destroy event on any elements with listeners.
2525+
jqLite.cleanData(fragment.querySelectorAll('*'));
25382526

2527+
// Update the jqLite collection to only contain the `newNode`
2528+
for (i = 1; i < removeCount; i++) {
2529+
delete elementsToRemove[i];
2530+
}
25392531
elementsToRemove[0] = newNode;
25402532
elementsToRemove.length = 1;
25412533
}

0 commit comments

Comments
 (0)