RetailCRM-Mirror/select2
1
0
Fork 0
mirror of synced 2024-11-26 06:46:04 +03:00
Code Issues Projects Releases Wiki Activity

Check that allowClear is used with placeholder

Browse Source 
The `allowClear` option may not work as intended if a placeholder
is not used. This is becaise the placeholder holds the value that
the `<select>` should be reset to when the `x` is hit.

An error is now properly raised in the console when Select2 detects
that the `allowClear` option is used without the `placeholder`
option.

This closes https://github.com/select2/select2/issues/3016.
This commit is contained in:
Kevin Brown 2015-02-06 19:17:30 -05:00
parent 7a8500f198
commit 78b6faf13e
8 changed files with 79 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
dist/js/select2.amd.full.js vendored
View File

@ -1142,6 +1142,15 @@ define('select2/selection/allowClear',[
decorated.call(this, container, $container);
if (self.placeholder == null) {
if (console && console.error) {
console.error(
'Select2: The `allowClear` option should be used in combination ' +
'with the `placeholder` option.'
);
}
}
this.$selection.on('mousedown', '.select2-selection__clear',
function (evt) {
// Ignore the event if it is disabled
@ -3796,13 +3805,13 @@ define('select2/defaults',[
options.selectionAdapter,
Placeholder
);
}
if (options.allowClear) {
options.selectionAdapter = Utils.Decorate(
options.selectionAdapter,
AllowClear
);
}
if (options.allowClear) {
options.selectionAdapter = Utils.Decorate(
options.selectionAdapter,
AllowClear
);
}
if (options.multiple) {

21
dist/js/select2.amd.js vendored
View File

@ -1142,6 +1142,15 @@ define('select2/selection/allowClear',[
decorated.call(this, container, $container);
if (self.placeholder == null) {
if (console && console.error) {
console.error(
'Select2: The `allowClear` option should be used in combination ' +
'with the `placeholder` option.'
);
}
}
this.$selection.on('mousedown', '.select2-selection__clear',
function (evt) {
// Ignore the event if it is disabled
@ -3796,13 +3805,13 @@ define('select2/defaults',[
options.selectionAdapter,
Placeholder
);
}
if (options.allowClear) {
options.selectionAdapter = Utils.Decorate(
options.selectionAdapter,
AllowClear
);
}
if (options.allowClear) {
options.selectionAdapter = Utils.Decorate(
options.selectionAdapter,
AllowClear
);
}
if (options.multiple) {

21
dist/js/select2.full.js vendored
View File

@ -1580,6 +1580,15 @@ define('select2/selection/allowClear',[
decorated.call(this, container, $container);
if (self.placeholder == null) {
if (console && console.error) {
console.error(
'Select2: The `allowClear` option should be used in combination ' +
'with the `placeholder` option.'
);
}
}
this.$selection.on('mousedown', '.select2-selection__clear',
function (evt) {
// Ignore the event if it is disabled
@ -4234,13 +4243,13 @@ define('select2/defaults',[
options.selectionAdapter,
Placeholder
);
}
if (options.allowClear) {
options.selectionAdapter = Utils.Decorate(
options.selectionAdapter,
AllowClear
);
}
if (options.allowClear) {
options.selectionAdapter = Utils.Decorate(
options.selectionAdapter,
AllowClear
);
}
if (options.multiple) {

4
dist/js/select2.full.min.js vendored
View File

File diff suppressed because one or more lines are too long

21
dist/js/select2.js vendored
View File

@ -1580,6 +1580,15 @@ define('select2/selection/allowClear',[
decorated.call(this, container, $container);
if (self.placeholder == null) {
if (console && console.error) {
console.error(
'Select2: The `allowClear` option should be used in combination ' +
'with the `placeholder` option.'
);
}
}
this.$selection.on('mousedown', '.select2-selection__clear',
function (evt) {
// Ignore the event if it is disabled
@ -4234,13 +4243,13 @@ define('select2/defaults',[
options.selectionAdapter,
Placeholder
);
}
if (options.allowClear) {
options.selectionAdapter = Utils.Decorate(
options.selectionAdapter,
AllowClear
);
}
if (options.allowClear) {
options.selectionAdapter = Utils.Decorate(
options.selectionAdapter,
AllowClear
);
}
if (options.multiple) {

4
dist/js/select2.min.js vendored
View File

File diff suppressed because one or more lines are too long

12
src/js/select2/defaults.js vendored
View File

@ -172,13 +172,13 @@ define([
options.selectionAdapter,
Placeholder
);
}
if (options.allowClear) {
options.selectionAdapter = Utils.Decorate(
options.selectionAdapter,
AllowClear
);
}
if (options.allowClear) {
options.selectionAdapter = Utils.Decorate(
options.selectionAdapter,
AllowClear
);
}
if (options.multiple) {

9
src/js/select2/selection/allowClear.js vendored
View File

@ -8,6 +8,15 @@ define([
decorated.call(this, container, $container);
if (self.placeholder == null) {
if (console && console.error) {
console.error(
'Select2: The `allowClear` option should be used in combination ' +
'with the `placeholder` option.'
);
}
}
this.$selection.on('mousedown', '.select2-selection__clear',
function (evt) {
// Ignore the event if it is disabled