From a2766b7ed63eab07956e3499edddefaa2d227d66 Mon Sep 17 00:00:00 2001 From: Kevin Brown Date: Thu, 13 Nov 2014 18:34:08 -0500 Subject: [PATCH] Added `destroy` method Now Select2 supports destroying itself, and all elements that it creates. --- dist/js/select2.amd.full.js | 57 +++++++++++++++++++++++++++++++- dist/js/select2.amd.js | 57 +++++++++++++++++++++++++++++++- dist/js/select2.full.js | 57 +++++++++++++++++++++++++++++++- dist/js/select2.full.min.js | 4 +-- dist/js/select2.js | 57 +++++++++++++++++++++++++++++++- dist/js/select2.min.js | 2 +- docs/examples.html | 11 ++++++ src/js/select2/core.js | 29 +++++++++++++++- src/js/select2/data/base.js | 4 +++ src/js/select2/data/select.js | 8 +++++ src/js/select2/dropdown.js | 7 ++++ src/js/select2/results.js | 4 +++ src/js/select2/selection/base.js | 5 +++ 13 files changed, 294 insertions(+), 8 deletions(-) diff --git a/dist/js/select2.amd.full.js b/dist/js/select2.amd.full.js index 18014184..647bb6bd 100644 --- a/dist/js/select2.amd.full.js +++ b/dist/js/select2.amd.full.js @@ -520,6 +520,10 @@ define('select2/results',[ }); }; + Results.prototype.destroy = function () { + this.$results.remove(); + }; + Results.prototype.ensureHighlightVisible = function () { var $highlighted = this.$results.find('.highlighted'); @@ -604,6 +608,11 @@ define('select2/selection/base',[ }); }; + BaseSelection.prototype.destroy = function () { + // Unbind the dropdown click handler if it exists + $(document.body).off('.select2.' + container.id); + }; + BaseSelection.prototype.update = function (data) { throw new Error('The `update` method must be defined in child classes.'); }; @@ -961,6 +970,10 @@ define('select2/data/base',[ // Can be implemented in subclasses }; + BaseAdapter.prototype.destroy = function () { + // Can be implemented in subclasses + }; + BaseAdapter.prototype.generateResultId = function (container, data) { var id = container.id + '-result-'; @@ -1074,6 +1087,14 @@ define('select2/data/select',[ }); }; + SelectAdapter.prototype.destroy = function () { + // Remove anything added to child elements + this.$element.find('*').each(function () { + // Remove any custom data set by Select2 + $.removeData(this, 'data'); + }); + }; + SelectAdapter.prototype.query = function (params, callback) { var data = []; var self = this; @@ -1479,9 +1500,16 @@ define('select2/dropdown',[ '' ); + this.$dropdown = $dropdown; + return $dropdown; }; + Dropdown.prototype.destroy = function () { + // Remove the dropdown from the DOM + this.$dropdown.remove(); + }; + Dropdown.prototype.bind = function (container, $container) { // Can be implemented in subclasses }; @@ -1950,6 +1978,10 @@ define('select2/core',[ './keys' ], function ($, Options, Utils, KEYS) { var Select2 = function ($element, options) { + if ($element.data('select2') != null) { + return; + } + this.$element = $element; this.id = this._generateId($element); @@ -2018,6 +2050,9 @@ define('select2/core',[ // Hide the original select $element.hide(); + + this._tabindex = $element.attr('tabindex') || 0; + $element.attr('tabindex', '-1'); $element.data('select2', this); @@ -2074,7 +2109,7 @@ define('select2/core',[ Select2.prototype._registerDomEvents = function () { var self = this; - this.$element.on('change', function () { + this.$element.on('change.select2', function () { self.data.current(function (data) { self.trigger('selection:update', { data: data @@ -2251,6 +2286,26 @@ define('select2/core',[ return this.$container.hasClass('open'); }; + Select2.prototype.destroy = function () { + this.$container.remove(); + + this.$element.off('.select2'); + this.$element.attr('tabindex', this._tabindex); + + this.$element.show(); + this.$element.removeData('select2'); + + this.data.destroy(); + this.selection.destroy(); + this.dropdown.destroy(); + this.results.destroy(); + + this.data = null; + this.selection = null; + this.dropdown = null; + this.results = null; + }; + Select2.prototype.render = function () { var $container = $( '' + diff --git a/dist/js/select2.amd.js b/dist/js/select2.amd.js index 3f1795e1..ab5cefad 100644 --- a/dist/js/select2.amd.js +++ b/dist/js/select2.amd.js @@ -520,6 +520,10 @@ define('select2/results',[ }); }; + Results.prototype.destroy = function () { + this.$results.remove(); + }; + Results.prototype.ensureHighlightVisible = function () { var $highlighted = this.$results.find('.highlighted'); @@ -604,6 +608,11 @@ define('select2/selection/base',[ }); }; + BaseSelection.prototype.destroy = function () { + // Unbind the dropdown click handler if it exists + $(document.body).off('.select2.' + container.id); + }; + BaseSelection.prototype.update = function (data) { throw new Error('The `update` method must be defined in child classes.'); }; @@ -961,6 +970,10 @@ define('select2/data/base',[ // Can be implemented in subclasses }; + BaseAdapter.prototype.destroy = function () { + // Can be implemented in subclasses + }; + BaseAdapter.prototype.generateResultId = function (container, data) { var id = container.id + '-result-'; @@ -1074,6 +1087,14 @@ define('select2/data/select',[ }); }; + SelectAdapter.prototype.destroy = function () { + // Remove anything added to child elements + this.$element.find('*').each(function () { + // Remove any custom data set by Select2 + $.removeData(this, 'data'); + }); + }; + SelectAdapter.prototype.query = function (params, callback) { var data = []; var self = this; @@ -1479,9 +1500,16 @@ define('select2/dropdown',[ '' ); + this.$dropdown = $dropdown; + return $dropdown; }; + Dropdown.prototype.destroy = function () { + // Remove the dropdown from the DOM + this.$dropdown.remove(); + }; + Dropdown.prototype.bind = function (container, $container) { // Can be implemented in subclasses }; @@ -1950,6 +1978,10 @@ define('select2/core',[ './keys' ], function ($, Options, Utils, KEYS) { var Select2 = function ($element, options) { + if ($element.data('select2') != null) { + return; + } + this.$element = $element; this.id = this._generateId($element); @@ -2018,6 +2050,9 @@ define('select2/core',[ // Hide the original select $element.hide(); + + this._tabindex = $element.attr('tabindex') || 0; + $element.attr('tabindex', '-1'); $element.data('select2', this); @@ -2074,7 +2109,7 @@ define('select2/core',[ Select2.prototype._registerDomEvents = function () { var self = this; - this.$element.on('change', function () { + this.$element.on('change.select2', function () { self.data.current(function (data) { self.trigger('selection:update', { data: data @@ -2251,6 +2286,26 @@ define('select2/core',[ return this.$container.hasClass('open'); }; + Select2.prototype.destroy = function () { + this.$container.remove(); + + this.$element.off('.select2'); + this.$element.attr('tabindex', this._tabindex); + + this.$element.show(); + this.$element.removeData('select2'); + + this.data.destroy(); + this.selection.destroy(); + this.dropdown.destroy(); + this.results.destroy(); + + this.data = null; + this.selection = null; + this.dropdown = null; + this.results = null; + }; + Select2.prototype.render = function () { var $container = $( '' + diff --git a/dist/js/select2.full.js b/dist/js/select2.full.js index 901a6787..7518067a 100644 --- a/dist/js/select2.full.js +++ b/dist/js/select2.full.js @@ -10055,6 +10055,10 @@ define('select2/results',[ }); }; + Results.prototype.destroy = function () { + this.$results.remove(); + }; + Results.prototype.ensureHighlightVisible = function () { var $highlighted = this.$results.find('.highlighted'); @@ -10139,6 +10143,11 @@ define('select2/selection/base',[ }); }; + BaseSelection.prototype.destroy = function () { + // Unbind the dropdown click handler if it exists + $(document.body).off('.select2.' + container.id); + }; + BaseSelection.prototype.update = function (data) { throw new Error('The `update` method must be defined in child classes.'); }; @@ -10496,6 +10505,10 @@ define('select2/data/base',[ // Can be implemented in subclasses }; + BaseAdapter.prototype.destroy = function () { + // Can be implemented in subclasses + }; + BaseAdapter.prototype.generateResultId = function (container, data) { var id = container.id + '-result-'; @@ -10609,6 +10622,14 @@ define('select2/data/select',[ }); }; + SelectAdapter.prototype.destroy = function () { + // Remove anything added to child elements + this.$element.find('*').each(function () { + // Remove any custom data set by Select2 + $.removeData(this, 'data'); + }); + }; + SelectAdapter.prototype.query = function (params, callback) { var data = []; var self = this; @@ -11014,9 +11035,16 @@ define('select2/dropdown',[ '' ); + this.$dropdown = $dropdown; + return $dropdown; }; + Dropdown.prototype.destroy = function () { + // Remove the dropdown from the DOM + this.$dropdown.remove(); + }; + Dropdown.prototype.bind = function (container, $container) { // Can be implemented in subclasses }; @@ -11485,6 +11513,10 @@ define('select2/core',[ './keys' ], function ($, Options, Utils, KEYS) { var Select2 = function ($element, options) { + if ($element.data('select2') != null) { + return; + } + this.$element = $element; this.id = this._generateId($element); @@ -11553,6 +11585,9 @@ define('select2/core',[ // Hide the original select $element.hide(); + + this._tabindex = $element.attr('tabindex') || 0; + $element.attr('tabindex', '-1'); $element.data('select2', this); @@ -11609,7 +11644,7 @@ define('select2/core',[ Select2.prototype._registerDomEvents = function () { var self = this; - this.$element.on('change', function () { + this.$element.on('change.select2', function () { self.data.current(function (data) { self.trigger('selection:update', { data: data @@ -11786,6 +11821,26 @@ define('select2/core',[ return this.$container.hasClass('open'); }; + Select2.prototype.destroy = function () { + this.$container.remove(); + + this.$element.off('.select2'); + this.$element.attr('tabindex', this._tabindex); + + this.$element.show(); + this.$element.removeData('select2'); + + this.data.destroy(); + this.selection.destroy(); + this.dropdown.destroy(); + this.results.destroy(); + + this.data = null; + this.selection = null; + this.dropdown = null; + this.results = null; + }; + Select2.prototype.render = function () { var $container = $( '' + diff --git a/dist/js/select2.full.min.js b/dist/js/select2.full.min.js index 4a6671fc..298b4c2a 100644 --- a/dist/js/select2.full.min.js +++ b/dist/js/select2.full.min.js @@ -1,4 +1,4 @@ window.$=window.$||{},function(){$&&$.fn&&$.fn.select2&&$.fn.select2.amd&&(c=$.fn.select2.amd.define,b=$.fn.select2.amd.require);var a,b,c;!function(d){function e(a,b){return u.call(a,b)}function f(a,b){var c,d,e,f,g,h,i,j,k,l,m,n=b&&b.split("/"),o=s.map,p=o&&o["*"]||{};if(a&&"."===a.charAt(0))if(b){for(n=n.slice(0,n.length-1),a=a.split("/"),g=a.length-1,s.nodeIdCompat&&w.test(a[g])&&(a[g]=a[g].replace(w,"")),a=n.concat(a),k=0;k0&&(a.splice(k-1,2),k-=2)}a=a.join("/")}else 0===a.indexOf("./")&&(a=a.substring(2));if((n||p)&&o){for(c=a.split("/"),k=c.length;k>0;k-=1){if(d=c.slice(0,k).join("/"),n)for(l=n.length;l>0;l-=1)if(e=o[n.slice(0,l).join("/")],e&&(e=e[d])){f=e,h=k;break}if(f)break;!i&&p&&p[d]&&(i=p[d],j=k)}!f&&i&&(f=i,h=j),f&&(c.splice(0,h,f),a=c.join("/"))}return a}function g(a,b){return function(){return n.apply(d,v.call(arguments,0).concat([a,b]))}}function h(a){return function(b){return f(b,a)}}function i(a){return function(b){q[a]=b}}function j(a){if(e(r,a)){var b=r[a];delete r[a],t[a]=!0,m.apply(d,b)}if(!e(q,a)&&!e(t,a))throw new Error("No "+a);return q[a]}function k(a){var b,c=a?a.indexOf("!"):-1;return c>-1&&(b=a.substring(0,c),a=a.substring(c+1,a.length)),[b,a]}function l(a){return function(){return s&&s.config&&s.config[a]||{}}}var m,n,o,p,q={},r={},s={},t={},u=Object.prototype.hasOwnProperty,v=[].slice,w=/\.js$/;o=function(a,b){var c,d=k(a),e=d[0];return a=d[1],e&&(e=f(e,b),c=j(e)),e?a=c&&c.normalize?c.normalize(a,h(b)):f(a,b):(a=f(a,b),d=k(a),e=d[0],a=d[1],e&&(c=j(e))),{f:e?e+"!"+a:a,n:a,pr:e,p:c}},p={require:function(a){return g(a)},exports:function(a){var b=q[a];return"undefined"!=typeof b?b:q[a]={}},module:function(a){return{id:a,uri:"",exports:q[a],config:l(a)}}},m=function(a,b,c,f){var h,k,l,m,n,s,u=[],v=typeof c;if(f=f||a,"undefined"===v||"function"===v){for(b=!b.length&&c.length?["require","exports","module"]:b,n=0;n0&&b-1 in a}function e(a,b,c){if(bb.isFunction(b))return bb.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return bb.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(ib.test(b))return bb.filter(b,a,c);b=bb.filter(b,a)}return bb.grep(a,function(a){return V.call(b,a)>=0!==c})}function f(a,b){for(;(a=a[b])&&1!==a.nodeType;);return a}function g(a){var b=pb[a]={};return bb.each(a.match(ob)||[],function(a,c){b[c]=!0}),b}function h(){_.removeEventListener("DOMContentLoaded",h,!1),a.removeEventListener("load",h,!1),bb.ready()}function i(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=bb.expando+Math.random()}function j(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(vb,"-$1").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:ub.test(c)?bb.parseJSON(c):c}catch(e){}tb.set(a,b,c)}else c=void 0;return c}function k(){return!0}function l(){return!1}function m(){try{return _.activeElement}catch(a){}}function n(a,b){return bb.nodeName(a,"table")&&bb.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function o(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function p(a){var b=Lb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function q(a,b){for(var c=0,d=a.length;d>c;c++)sb.set(a[c],"globalEval",!b||sb.get(b[c],"globalEval"))}function r(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(sb.hasData(a)&&(f=sb.access(a),g=sb.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)bb.event.add(b,e,j[e][c])}tb.hasData(a)&&(h=tb.access(a),i=bb.extend({},h),tb.set(b,i))}}function s(a,b){var c=a.getElementsByTagName?a.getElementsByTagName(b||"*"):a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&bb.nodeName(a,b)?bb.merge([a],c):c}function t(a,b){var c=b.nodeName.toLowerCase();"input"===c&&zb.test(a.type)?b.checked=a.checked:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}function u(b,c){var d=bb(c.createElement(b)).appendTo(c.body),e=a.getDefaultComputedStyle?a.getDefaultComputedStyle(d[0]).display:bb.css(d[0],"display");return d.detach(),e}function v(a){var b=_,c=Pb[a];return c||(c=u(a,b),"none"!==c&&c||(Ob=(Ob||bb("