Skip to content

Commit 497d5a0

Browse files
committed
version 4.0.10
1 parent fbb4ed6 commit 497d5a0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+147
-115
lines changed

lib/select2-rails/version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module Select2
22
module Rails
3-
VERSION = '4.0.9'
3+
VERSION = '4.0.10'
44
end
55
end

vendor/assets/javascripts/select2-full.js

+43-27
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Select2 4.0.9
2+
* Select2 4.0.10
33
* https://select2.github.io
44
*
55
* Released under the MIT license
@@ -4306,7 +4306,7 @@ S2.define('select2/dropdown/attachBody',[
43064306
'../utils'
43074307
], function ($, Utils) {
43084308
function AttachBody (decorated, $element, options) {
4309-
this.$dropdownParent = options.get('dropdownParent') || $(document.body);
4309+
this.$dropdownParent = $(options.get('dropdownParent') || document.body);
43104310

43114311
decorated.call(this, $element, options);
43124312
}
@@ -4319,38 +4319,16 @@ S2.define('select2/dropdown/attachBody',[
43194319
container.on('open', function () {
43204320
self._showDropdown();
43214321
self._attachPositioningHandler(container);
4322+
4323+
// Must bind after the results handlers to ensure correct sizing
4324+
self._bindContainerResultHandlers(container);
43224325
});
43234326

43244327
container.on('close', function () {
43254328
self._hideDropdown();
43264329
self._detachPositioningHandler(container);
43274330
});
43284331

4329-
container.on('results:all', function () {
4330-
self._positionDropdown();
4331-
self._resizeDropdown();
4332-
});
4333-
4334-
container.on('results:append', function () {
4335-
self._positionDropdown();
4336-
self._resizeDropdown();
4337-
});
4338-
4339-
container.on('results:message', function () {
4340-
self._positionDropdown();
4341-
self._resizeDropdown();
4342-
});
4343-
4344-
container.on('select', function () {
4345-
self._positionDropdown();
4346-
self._resizeDropdown();
4347-
});
4348-
4349-
container.on('unselect', function () {
4350-
self._positionDropdown();
4351-
self._resizeDropdown();
4352-
});
4353-
43544332
this.$dropdownContainer.on('mousedown', function (evt) {
43554333
evt.stopPropagation();
43564334
});
@@ -4392,6 +4370,44 @@ S2.define('select2/dropdown/attachBody',[
43924370
this.$dropdownContainer.detach();
43934371
};
43944372

4373+
AttachBody.prototype._bindContainerResultHandlers =
4374+
function (decorated, container) {
4375+
4376+
// These should only be bound once
4377+
if (this._containerResultsHandlersBound) {
4378+
return;
4379+
}
4380+
4381+
var self = this;
4382+
4383+
container.on('results:all', function () {
4384+
self._positionDropdown();
4385+
self._resizeDropdown();
4386+
});
4387+
4388+
container.on('results:append', function () {
4389+
self._positionDropdown();
4390+
self._resizeDropdown();
4391+
});
4392+
4393+
container.on('results:message', function () {
4394+
self._positionDropdown();
4395+
self._resizeDropdown();
4396+
});
4397+
4398+
container.on('select', function () {
4399+
self._positionDropdown();
4400+
self._resizeDropdown();
4401+
});
4402+
4403+
container.on('unselect', function () {
4404+
self._positionDropdown();
4405+
self._resizeDropdown();
4406+
});
4407+
4408+
this._containerResultsHandlersBound = true;
4409+
};
4410+
43954411
AttachBody.prototype._attachPositioningHandler =
43964412
function (decorated, container) {
43974413
var self = this;

vendor/assets/javascripts/select2.js

+43-27
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* Select2 4.0.9
2+
* Select2 4.0.10
33
* https://select2.github.io
44
*
55
* Released under the MIT license
@@ -4306,7 +4306,7 @@ S2.define('select2/dropdown/attachBody',[
43064306
'../utils'
43074307
], function ($, Utils) {
43084308
function AttachBody (decorated, $element, options) {
4309-
this.$dropdownParent = options.get('dropdownParent') || $(document.body);
4309+
this.$dropdownParent = $(options.get('dropdownParent') || document.body);
43104310

43114311
decorated.call(this, $element, options);
43124312
}
@@ -4319,38 +4319,16 @@ S2.define('select2/dropdown/attachBody',[
43194319
container.on('open', function () {
43204320
self._showDropdown();
43214321
self._attachPositioningHandler(container);
4322+
4323+
// Must bind after the results handlers to ensure correct sizing
4324+
self._bindContainerResultHandlers(container);
43224325
});
43234326

43244327
container.on('close', function () {
43254328
self._hideDropdown();
43264329
self._detachPositioningHandler(container);
43274330
});
43284331

4329-
container.on('results:all', function () {
4330-
self._positionDropdown();
4331-
self._resizeDropdown();
4332-
});
4333-
4334-
container.on('results:append', function () {
4335-
self._positionDropdown();
4336-
self._resizeDropdown();
4337-
});
4338-
4339-
container.on('results:message', function () {
4340-
self._positionDropdown();
4341-
self._resizeDropdown();
4342-
});
4343-
4344-
container.on('select', function () {
4345-
self._positionDropdown();
4346-
self._resizeDropdown();
4347-
});
4348-
4349-
container.on('unselect', function () {
4350-
self._positionDropdown();
4351-
self._resizeDropdown();
4352-
});
4353-
43544332
this.$dropdownContainer.on('mousedown', function (evt) {
43554333
evt.stopPropagation();
43564334
});
@@ -4392,6 +4370,44 @@ S2.define('select2/dropdown/attachBody',[
43924370
this.$dropdownContainer.detach();
43934371
};
43944372

4373+
AttachBody.prototype._bindContainerResultHandlers =
4374+
function (decorated, container) {
4375+
4376+
// These should only be bound once
4377+
if (this._containerResultsHandlersBound) {
4378+
return;
4379+
}
4380+
4381+
var self = this;
4382+
4383+
container.on('results:all', function () {
4384+
self._positionDropdown();
4385+
self._resizeDropdown();
4386+
});
4387+
4388+
container.on('results:append', function () {
4389+
self._positionDropdown();
4390+
self._resizeDropdown();
4391+
});
4392+
4393+
container.on('results:message', function () {
4394+
self._positionDropdown();
4395+
self._resizeDropdown();
4396+
});
4397+
4398+
container.on('select', function () {
4399+
self._positionDropdown();
4400+
self._resizeDropdown();
4401+
});
4402+
4403+
container.on('unselect', function () {
4404+
self._positionDropdown();
4405+
self._resizeDropdown();
4406+
});
4407+
4408+
this._containerResultsHandlersBound = true;
4409+
};
4410+
43954411
AttachBody.prototype._attachPositioningHandler =
43964412
function (decorated, container) {
43974413
var self = this;

vendor/assets/javascripts/select2_locale_af.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/assets/javascripts/select2_locale_ar.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/assets/javascripts/select2_locale_az.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/assets/javascripts/select2_locale_bg.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/assets/javascripts/select2_locale_bn.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/assets/javascripts/select2_locale_bs.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/assets/javascripts/select2_locale_ca.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/assets/javascripts/select2_locale_cs.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/assets/javascripts/select2_locale_da.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/assets/javascripts/select2_locale_de.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/assets/javascripts/select2_locale_dsb.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/assets/javascripts/select2_locale_el.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)