RetailCRM-Mirror/select2
1
0
Fork 0
mirror of synced 2025-02-03 21:59:24 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2313 from FallSe7en/master

Browse Source 
Cleanup jQuery DOM elements on destroy
This commit is contained in:
Kevin Brown 2014-04-26 15:59:47 -04:00
commit 9e505cdf27
1 changed files with 42 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
select2.js
View File

@ -234,20 +234,6 @@ the specific language governing permissions and limitations under the Apache Lic
};
}
/**
* A simple implementation of a thunk
* @param formula function used to lazily initialize the thunk
* @return {Function}
*/
function thunk(formula) {
var evaluated = false,
value;
return function() {
if (evaluated === false) { value = formula(); evaluated = true; }
return value;
};
};
function installDebouncedScroll(threshold, element) {
var notify = debounce(threshold, function (e) { element.trigger("scroll-debounced", e);});
element.on("scroll", function (e) {
@ -640,6 +626,15 @@ the specific language governing permissions and limitations under the Apache Lic
if (original!==input) return input;
}
function cleanupJQueryElements() {
var self = this;
Array.prototype.forEach.call(arguments, function (element) {
self[element].remove();
self[element] = null;
});
}
/**
* Creates a new class
*
@ -695,8 +690,7 @@ the specific language governing permissions and limitations under the Apache Lic
this.container.attr("title", opts.element.attr("title"));
// cache the body so future lookups are cheap
this.body = thunk(function() { return opts.element.closest("body"); });
this.body = $("body");
syncCssClasses(this.container, this.opts.element, this.opts.adaptContainerCssClass);
@ -832,7 +826,10 @@ the specific language governing permissions and limitations under the Apache Lic
this.close();
if (this.propertyObserver) { delete this.propertyObserver; this.propertyObserver = null; }
if (this.propertyObserver) {
this.propertyObserver.disconnect();
this.propertyObserver = null;
}
if (select2 !== undefined) {
select2.container.remove();
@ -850,6 +847,14 @@ the specific language governing permissions and limitations under the Apache Lic
}
element.show();
}
cleanupJQueryElements.call(this,
"container",
"liveRegion",
"dropdown",
"results",
"search"
);
},
// abstract
@ -1089,18 +1094,13 @@ the specific language governing permissions and limitations under the Apache Lic
});
}
// hold onto a reference of the callback to work around a chromium bug
if (this.mutationCallback === undefined) {
this.mutationCallback = function (mutations) {
mutations.forEach(sync);
}
}
// safari, chrome, firefox, IE11
observer = window.MutationObserver || window.WebKitMutationObserver|| window.MozMutationObserver;
if (observer !== undefined) {
if (this.propertyObserver) { delete this.propertyObserver; this.propertyObserver = null; }
this.propertyObserver = new observer(this.mutationCallback);
this.propertyObserver = new observer(function (mutations) {
mutations.forEach(sync);
});
this.propertyObserver.observe(el.get(0), { attributes:true, subtree:false });
}
},
@ -1258,11 +1258,11 @@ the specific language governing permissions and limitations under the Apache Lic
}
//console.log("below/ droptop:", dropTop, "dropHeight", dropHeight, "sum", (dropTop+dropHeight)+" viewport bottom", viewportBottom, "enough?", enoughRoomBelow);
//console.log("above/ offset.top", offset.top, "dropHeight", dropHeight, "top", (offset.top-dropHeight), "scrollTop", this.body().scrollTop(), "enough?", enoughRoomAbove);
//console.log("above/ offset.top", offset.top, "dropHeight", dropHeight, "top", (offset.top-dropHeight), "scrollTop", this.body.scrollTop(), "enough?", enoughRoomAbove);
// fix positioning when body has an offset and is not position: static
if (this.body().css('position') !== 'static') {
bodyOffset = this.body().offset();
if (this.body.css('position') !== 'static') {
bodyOffset = this.body.offset();
dropTop -= bodyOffset.top;
dropLeft -= bodyOffset.left;
}
@ -1344,8 +1344,8 @@ the specific language governing permissions and limitations under the Apache Lic
this.clearDropdownAlignmentPreference();
if(this.dropdown[0] !== this.body().children().last()[0]) {
this.dropdown.detach().appendTo(this.body());
if(this.dropdown[0] !== this.body.children().last()[0]) {
this.dropdown.detach().appendTo(this.body);
}
// create the dropdown mask if doesn't already exist
@ -1354,7 +1354,7 @@ the specific language governing permissions and limitations under the Apache Lic
mask = $(document.createElement("div"));
mask.attr("id","select2-drop-mask").attr("class","select2-drop-mask");
mask.hide();
mask.appendTo(this.body());
mask.appendTo(this.body);
mask.on("mousedown touchstart click", function (e) {
// Prevent IE from generating a click event on the body
reinsertElement(mask);
@ -2009,6 +2009,11 @@ the specific language governing permissions and limitations under the Apache Lic
$("label[for='" + this.focusser.attr('id') + "']")
.attr('for', this.opts.element.attr("id"));
this.parent.destroy.apply(this, arguments);
cleanupJQueryElements.call(this,
"selection",
"focusser"
);
},
// single
@ -2090,7 +2095,7 @@ the specific language governing permissions and limitations under the Apache Lic
this.search.on("blur", this.bind(function(e) {
// a workaround for chrome to keep the search field focussed when the scroll bar is used to scroll the dropdown.
// without this the search field loses focus which is annoying
if (document.activeElement === this.body().get(0)) {
if (document.activeElement === this.body.get(0)) {
window.setTimeout(this.bind(function() {
if (this.opened()) {
this.search.focus();
@ -2599,6 +2604,11 @@ the specific language governing permissions and limitations under the Apache Lic
$("label[for='" + this.search.attr('id') + "']")
.attr('for', this.opts.element.attr("id"));
this.parent.destroy.apply(this, arguments);
cleanupJQueryElements.call(this,
"searchContainer",
"selection"
);
},
// multi