From 6a0c002f9408f34dd85b1661e2a8c70dfaff71e6 Mon Sep 17 00:00:00 2001 From: Kevin Brown Date: Tue, 25 Nov 2014 15:39:42 -0500 Subject: [PATCH] Add a module for attaching the dropdown to the body In Select2 3.x, the dropdown is attached to the body element and it is floated above all other elements. In Select2 4.x, the dropdown is attached directly to the Select2 container, which allows us to skip any special placing logic. This happens to be how Chosen currently does it, and it prevents us from having the dropdown display up, as well as a few other strange issues that can't be prevented. This new module will most likely become the default, as it matches the functionality of Select2 3.x and has quite a few advantages. The other positioning code will need to be broken out into a separate module in the future. --- dist/js/select2.amd.full.js | 87 +++++++++++++++++++++++++-- dist/js/select2.amd.js | 87 +++++++++++++++++++++++++-- dist/js/select2.full.js | 87 +++++++++++++++++++++++++-- dist/js/select2.full.min.js | 2 +- dist/js/select2.js | 87 +++++++++++++++++++++++++-- dist/js/select2.min.js | 2 +- src/js/select2/core.js | 2 +- src/js/select2/defaults.js | 7 +++ src/js/select2/dropdown/attachBody.js | 72 ++++++++++++++++++++++ src/js/select2/results.js | 4 +- 10 files changed, 416 insertions(+), 21 deletions(-) create mode 100644 src/js/select2/dropdown/attachBody.js diff --git a/dist/js/select2.amd.full.js b/dist/js/select2.amd.full.js index bb295e2b..9b1b8b07 100644 --- a/dist/js/select2.amd.full.js +++ b/dist/js/select2.amd.full.js @@ -230,8 +230,8 @@ define('select2/results',[ this.$results.append($options); }; - Results.prototype.position = function ($results, $container) { - var $resultsContainer = $container.find('.select2-results'); + Results.prototype.position = function ($results, $dropdown) { + var $resultsContainer = $dropdown.find('.select2-results'); $resultsContainer.append($results); }; @@ -2812,6 +2812,79 @@ define('select2/dropdown/infiniteScroll',[ return InfiniteScroll; }); +define('select2/dropdown/attachBody',[ + +], function () { + function AttachBody (decorated, $element, options) { + decorated.call(this, $element, options); + } + + AttachBody.prototype.bind = function (decorated, container, $container) { + var self = this; + + decorated.call(this, container, $container); + + container.on('open', function () { + self._showDropdown(); + }); + + container.on('close', function () { + self._hideDropdown(); + }); + + this.$dropdownContainer.on('mousedown', function (evt) { + evt.stopPropagation(); + }); + }; + + AttachBody.prototype.position = function (decorated, $dropdown, $container) { + // Clone all of the container classes + $dropdown.attr('class', $container.attr('class')); + + $dropdown.removeClass('select2'); + $dropdown.addClass('select2-container--open'); + + $dropdown.css({ + position: 'absolute' + }); + + $dropdown.width($container.outerWidth(false)); + + this.$container = $container; + }; + + AttachBody.prototype.render = function (decorated) { + var $container = $(''); + + var $dropdown = decorated.call(this); + $container.append($dropdown); + + this.$dropdownContainer = $container; + + return $container; + }; + + AttachBody.prototype._hideDropdown = function (decorated) { + this.$dropdownContainer.detach(); + }; + + AttachBody.prototype._positionDropdown = function () { + var css = this.$container.offset(); + + css.top += this.$container.outerHeight(true); + + this.$dropdownContainer.css(css); + }; + + AttachBody.prototype._showDropdown = function (decorated) { + this.$dropdownContainer.appendTo(document.body); + + this._positionDropdown(); + }; + + return AttachBody; +}); + define('select2/i18n/en',[],function () { return { errorLoading: function () { @@ -2884,6 +2957,7 @@ define('select2/defaults',[ './dropdown/search', './dropdown/hidePlaceholder', './dropdown/infiniteScroll', + './dropdown/attachBody', './i18n/en' ], function ($, ResultsList, @@ -2892,6 +2966,7 @@ define('select2/defaults',[ Utils, Translation, DIACRITICS, SelectData, ArrayData, AjaxData, Tags, MinimumInputLength, Dropdown, DropdownSearch, HidePlaceholder, InfiniteScroll, + AttachBody, EnglishTranslation) { function Defaults () { this.reset(); @@ -2948,6 +3023,11 @@ define('select2/defaults',[ options.dropdownAdapter = SearchableDropdown; } + + options.dropdownAdapter = Utils.Decorate( + options.dropdownAdapter, + AttachBody + ); } if (options.selectionAdapter == null) { @@ -3162,10 +3242,9 @@ define('select2/core',[ var ResultsAdapter = this.options.get('resultsAdapter'); this.results = new ResultsAdapter($element, this.options, this.data); - this.$results = this.results.render(); - this.results.position(this.$results, $container); + this.results.position(this.$results, this.$dropdown); // Bind events diff --git a/dist/js/select2.amd.js b/dist/js/select2.amd.js index 2c4175ec..34c99d77 100644 --- a/dist/js/select2.amd.js +++ b/dist/js/select2.amd.js @@ -230,8 +230,8 @@ define('select2/results',[ this.$results.append($options); }; - Results.prototype.position = function ($results, $container) { - var $resultsContainer = $container.find('.select2-results'); + Results.prototype.position = function ($results, $dropdown) { + var $resultsContainer = $dropdown.find('.select2-results'); $resultsContainer.append($results); }; @@ -2812,6 +2812,79 @@ define('select2/dropdown/infiniteScroll',[ return InfiniteScroll; }); +define('select2/dropdown/attachBody',[ + +], function () { + function AttachBody (decorated, $element, options) { + decorated.call(this, $element, options); + } + + AttachBody.prototype.bind = function (decorated, container, $container) { + var self = this; + + decorated.call(this, container, $container); + + container.on('open', function () { + self._showDropdown(); + }); + + container.on('close', function () { + self._hideDropdown(); + }); + + this.$dropdownContainer.on('mousedown', function (evt) { + evt.stopPropagation(); + }); + }; + + AttachBody.prototype.position = function (decorated, $dropdown, $container) { + // Clone all of the container classes + $dropdown.attr('class', $container.attr('class')); + + $dropdown.removeClass('select2'); + $dropdown.addClass('select2-container--open'); + + $dropdown.css({ + position: 'absolute' + }); + + $dropdown.width($container.outerWidth(false)); + + this.$container = $container; + }; + + AttachBody.prototype.render = function (decorated) { + var $container = $(''); + + var $dropdown = decorated.call(this); + $container.append($dropdown); + + this.$dropdownContainer = $container; + + return $container; + }; + + AttachBody.prototype._hideDropdown = function (decorated) { + this.$dropdownContainer.detach(); + }; + + AttachBody.prototype._positionDropdown = function () { + var css = this.$container.offset(); + + css.top += this.$container.outerHeight(true); + + this.$dropdownContainer.css(css); + }; + + AttachBody.prototype._showDropdown = function (decorated) { + this.$dropdownContainer.appendTo(document.body); + + this._positionDropdown(); + }; + + return AttachBody; +}); + define('select2/i18n/en',[],function () { return { errorLoading: function () { @@ -2884,6 +2957,7 @@ define('select2/defaults',[ './dropdown/search', './dropdown/hidePlaceholder', './dropdown/infiniteScroll', + './dropdown/attachBody', './i18n/en' ], function ($, ResultsList, @@ -2892,6 +2966,7 @@ define('select2/defaults',[ Utils, Translation, DIACRITICS, SelectData, ArrayData, AjaxData, Tags, MinimumInputLength, Dropdown, DropdownSearch, HidePlaceholder, InfiniteScroll, + AttachBody, EnglishTranslation) { function Defaults () { this.reset(); @@ -2948,6 +3023,11 @@ define('select2/defaults',[ options.dropdownAdapter = SearchableDropdown; } + + options.dropdownAdapter = Utils.Decorate( + options.dropdownAdapter, + AttachBody + ); } if (options.selectionAdapter == null) { @@ -3162,10 +3242,9 @@ define('select2/core',[ var ResultsAdapter = this.options.get('resultsAdapter'); this.results = new ResultsAdapter($element, this.options, this.data); - this.$results = this.results.render(); - this.results.position(this.$results, $container); + this.results.position(this.$results, this.$dropdown); // Bind events diff --git a/dist/js/select2.full.js b/dist/js/select2.full.js index 7fa33cde..6255049c 100644 --- a/dist/js/select2.full.js +++ b/dist/js/select2.full.js @@ -9765,8 +9765,8 @@ define('select2/results',[ this.$results.append($options); }; - Results.prototype.position = function ($results, $container) { - var $resultsContainer = $container.find('.select2-results'); + Results.prototype.position = function ($results, $dropdown) { + var $resultsContainer = $dropdown.find('.select2-results'); $resultsContainer.append($results); }; @@ -12347,6 +12347,79 @@ define('select2/dropdown/infiniteScroll',[ return InfiniteScroll; }); +define('select2/dropdown/attachBody',[ + +], function () { + function AttachBody (decorated, $element, options) { + decorated.call(this, $element, options); + } + + AttachBody.prototype.bind = function (decorated, container, $container) { + var self = this; + + decorated.call(this, container, $container); + + container.on('open', function () { + self._showDropdown(); + }); + + container.on('close', function () { + self._hideDropdown(); + }); + + this.$dropdownContainer.on('mousedown', function (evt) { + evt.stopPropagation(); + }); + }; + + AttachBody.prototype.position = function (decorated, $dropdown, $container) { + // Clone all of the container classes + $dropdown.attr('class', $container.attr('class')); + + $dropdown.removeClass('select2'); + $dropdown.addClass('select2-container--open'); + + $dropdown.css({ + position: 'absolute' + }); + + $dropdown.width($container.outerWidth(false)); + + this.$container = $container; + }; + + AttachBody.prototype.render = function (decorated) { + var $container = $(''); + + var $dropdown = decorated.call(this); + $container.append($dropdown); + + this.$dropdownContainer = $container; + + return $container; + }; + + AttachBody.prototype._hideDropdown = function (decorated) { + this.$dropdownContainer.detach(); + }; + + AttachBody.prototype._positionDropdown = function () { + var css = this.$container.offset(); + + css.top += this.$container.outerHeight(true); + + this.$dropdownContainer.css(css); + }; + + AttachBody.prototype._showDropdown = function (decorated) { + this.$dropdownContainer.appendTo(document.body); + + this._positionDropdown(); + }; + + return AttachBody; +}); + define('select2/i18n/en',[],function () { return { errorLoading: function () { @@ -12419,6 +12492,7 @@ define('select2/defaults',[ './dropdown/search', './dropdown/hidePlaceholder', './dropdown/infiniteScroll', + './dropdown/attachBody', './i18n/en' ], function ($, ResultsList, @@ -12427,6 +12501,7 @@ define('select2/defaults',[ Utils, Translation, DIACRITICS, SelectData, ArrayData, AjaxData, Tags, MinimumInputLength, Dropdown, DropdownSearch, HidePlaceholder, InfiniteScroll, + AttachBody, EnglishTranslation) { function Defaults () { this.reset(); @@ -12483,6 +12558,11 @@ define('select2/defaults',[ options.dropdownAdapter = SearchableDropdown; } + + options.dropdownAdapter = Utils.Decorate( + options.dropdownAdapter, + AttachBody + ); } if (options.selectionAdapter == null) { @@ -12697,10 +12777,9 @@ define('select2/core',[ var ResultsAdapter = this.options.get('resultsAdapter'); this.results = new ResultsAdapter($element, this.options, this.data); - this.$results = this.results.render(); - this.results.position(this.$results, $container); + this.results.position(this.$results, this.$dropdown); // Bind events diff --git a/dist/js/select2.full.min.js b/dist/js/select2.full.min.js index dfb1c47e..597b3f9d 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("