Skip to content

Commit 1349579

Browse files
committed
Respect -1 with minimumResultsForSearch
In past versions of Select2, supplying a value less than zero to `minimumResultsForSearch` acted the same as providing a high value, such as `Infinity`. This corrects the regression by mapping anything less than zero to the value `Infinity`. This closes select2#2994.
1 parent 0f7a37b commit 1349579

7 files changed

Lines changed: 22 additions & 2 deletions

File tree

dist/js/select2.amd.full.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3555,6 +3555,10 @@ define('select2/dropdown/minimumResultsForSearch',[
35553555
function MinimumResultsForSearch (decorated, $element, options, dataAdapter) {
35563556
this.minimumResultsForSearch = options.get('minimumResultsForSearch');
35573557

3558+
if (this.minimumResultsForSearch < 0) {
3559+
this.minimumResultsForSearch = Infinity;
3560+
}
3561+
35583562
decorated.call(this, $element, options, dataAdapter);
35593563
}
35603564

dist/js/select2.amd.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3555,6 +3555,10 @@ define('select2/dropdown/minimumResultsForSearch',[
35553555
function MinimumResultsForSearch (decorated, $element, options, dataAdapter) {
35563556
this.minimumResultsForSearch = options.get('minimumResultsForSearch');
35573557

3558+
if (this.minimumResultsForSearch < 0) {
3559+
this.minimumResultsForSearch = Infinity;
3560+
}
3561+
35583562
decorated.call(this, $element, options, dataAdapter);
35593563
}
35603564

dist/js/select2.full.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3993,6 +3993,10 @@ define('select2/dropdown/minimumResultsForSearch',[
39933993
function MinimumResultsForSearch (decorated, $element, options, dataAdapter) {
39943994
this.minimumResultsForSearch = options.get('minimumResultsForSearch');
39953995

3996+
if (this.minimumResultsForSearch < 0) {
3997+
this.minimumResultsForSearch = Infinity;
3998+
}
3999+
39964000
decorated.call(this, $element, options, dataAdapter);
39974001
}
39984002

dist/js/select2.full.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/select2.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3993,6 +3993,10 @@ define('select2/dropdown/minimumResultsForSearch',[
39933993
function MinimumResultsForSearch (decorated, $element, options, dataAdapter) {
39943994
this.minimumResultsForSearch = options.get('minimumResultsForSearch');
39953995

3996+
if (this.minimumResultsForSearch < 0) {
3997+
this.minimumResultsForSearch = Infinity;
3998+
}
3999+
39964000
decorated.call(this, $element, options, dataAdapter);
39974001
}
39984002

dist/js/select2.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/js/select2/dropdown/minimumResultsForSearch.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ define([
2020
function MinimumResultsForSearch (decorated, $element, options, dataAdapter) {
2121
this.minimumResultsForSearch = options.get('minimumResultsForSearch');
2222

23+
if (this.minimumResultsForSearch < 0) {
24+
this.minimumResultsForSearch = Infinity;
25+
}
26+
2327
decorated.call(this, $element, options, dataAdapter);
2428
}
2529

0 commit comments

Comments
 (0)