Skip to content

Commit c95a13f

Browse files
dvg-p4dvg-p4
committed
Run make
1 parent f303402 commit c95a13f

18 files changed

+73
-44
lines changed

‎dist/css/selectize.bootstrap2.css

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

‎dist/css/selectize.bootstrap3.css

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

‎dist/css/selectize.bootstrap4.css

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

‎dist/css/selectize.bootstrap5.css

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

‎dist/css/selectize.css

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

‎dist/css/selectize.default.css

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

‎dist/js/selectize.js

+25-11
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* https://selectize.dev
44
*
55
* Copyright (c) 2013-2015 Brian Reavis & contributors
6-
* Copyright (c) 2020-2023 Selectize Team & contributors
6+
* Copyright (c) 2020-2024 Selectize Team & contributors
77
*
88
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
99
* file except in compliance with the License. You may obtain a copy of the License at:
@@ -1190,6 +1190,10 @@ $.extend(Selectize.prototype, {
11901190
var defaultPrevented = e.isDefaultPrevented();
11911191
var $target = $(e.target);
11921192

1193+
if (e.button && e.button === 2) {
1194+
return;
1195+
}
1196+
11931197
if (!self.isFocused) {
11941198
if (!defaultPrevented) {
11951199
window.setTimeout(function () {
@@ -1444,6 +1448,10 @@ $.extend(Selectize.prototype, {
14441448
e.stopPropagation();
14451449
}
14461450

1451+
if (e.button && e.button === 2) {
1452+
return;
1453+
}
1454+
14471455
$target = $(e.currentTarget);
14481456
if ($target.hasClass('create')) {
14491457
self.createItem(null, function() {
@@ -1982,22 +1990,28 @@ $.extend(Selectize.prototype, {
19821990
self.removeItem(value, silent);
19831991
},
19841992

1985-
clearOptions: function(silent) {
1993+
clearOptions: function(silent = false, removeCurrentItems = true) {
19861994
var self = this;
19871995

19881996
self.loadedSearches = {};
19891997
self.userOptions = {};
19901998
self.renderCache = {};
1991-
var options = self.options;
1992-
$.each(self.options, function(key, value) {
1993-
if(self.items.indexOf(key) == -1) {
1994-
delete options[key];
1995-
}
1996-
});
1997-
self.options = self.sifter.items = options;
1999+
if (removeCurrentItems) {
2000+
self.options = self.sifter.items = {};
2001+
} else {
2002+
var options = self.options;
2003+
$.each(self.options, function(key, value) {
2004+
if(self.items.indexOf(key) == -1) {
2005+
delete options[key];
2006+
}
2007+
});
2008+
self.options = self.sifter.items = options;
2009+
}
19982010
self.lastQuery = null;
19992011
self.trigger('option_clear');
2000-
self.clear(silent);
2012+
if (removeCurrentItems) {
2013+
self.clear(silent);
2014+
}
20012015
},
20022016

20032017
getOption: function(value) {
@@ -2891,8 +2905,8 @@ $.fn.selectize = function (settings_user) {
28912905
}
28922906

28932907
var option = readData($option) || {};
2894-
option[field_label] = option[field_label] || $option.text();
28952908
option[field_value] = option[field_value] || value;
2909+
option[field_label] = option[field_label] || $option.text() || option[field_value];
28962910
option[field_disabled] = option[field_disabled] || $option.prop('disabled');
28972911
option[field_optgroup] = option[field_optgroup] || group;
28982912
option.styles = $option.attr('style') || '';

‎dist/js/selectize.min.js

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

‎dist/scss/plugins/clear_button.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
width: 25px;
88
top: 0;
99
right: calc(#{$select-padding-x} - #{$select-padding-item-x});
10-
color: rgba(0, 0, 0);
10+
color: rgb(0, 0, 0);
1111
opacity: 0.4;
1212
font-weight: bold;
1313
border: none;

‎docs/docs/API/selectize.mdx

+6-5
Original file line numberDiff line numberDiff line change
@@ -458,14 +458,15 @@ Removes a single option.
458458

459459
<a name="clearOptions"></a>
460460

461-
## clearOptions(silent)
462-
Clears all options, including all selected items
461+
## clearOptions([silent], [removeCurrentItems])
462+
Removes all options, by default including all selected items
463463

464464
**Kind**: global function
465465

466-
| Param | Type |
467-
| --- | --- |
468-
| silent | <code>boolean</code> |
466+
| Param | Type | Default | Description |
467+
| --- | --- | --- | --- |
468+
| [silent] | <code>boolean</code> | <code>false</code> | If truthy, no change event will be fired on the original input. No effect if removeCurrentItems is false. |
469+
| [removeCurrentItems] | <code>boolean</code> | <code>true</code> | If truthy, deselect and remove currently-selected items. |
469470

470471
<a name="getOption"></a>
471472

‎docs/static/css/selectize.bootstrap2.css

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

‎docs/static/css/selectize.bootstrap3.css

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

‎docs/static/css/selectize.bootstrap4.css

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

‎docs/static/css/selectize.bootstrap5.css

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

‎docs/static/css/selectize.css

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

‎docs/static/css/selectize.default.css

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

‎docs/static/js/selectize.js

+25-11
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* https://selectize.dev
44
*
55
* Copyright (c) 2013-2015 Brian Reavis & contributors
6-
* Copyright (c) 2020-2023 Selectize Team & contributors
6+
* Copyright (c) 2020-2024 Selectize Team & contributors
77
*
88
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
99
* file except in compliance with the License. You may obtain a copy of the License at:
@@ -1190,6 +1190,10 @@ $.extend(Selectize.prototype, {
11901190
var defaultPrevented = e.isDefaultPrevented();
11911191
var $target = $(e.target);
11921192

1193+
if (e.button && e.button === 2) {
1194+
return;
1195+
}
1196+
11931197
if (!self.isFocused) {
11941198
if (!defaultPrevented) {
11951199
window.setTimeout(function () {
@@ -1444,6 +1448,10 @@ $.extend(Selectize.prototype, {
14441448
e.stopPropagation();
14451449
}
14461450

1451+
if (e.button && e.button === 2) {
1452+
return;
1453+
}
1454+
14471455
$target = $(e.currentTarget);
14481456
if ($target.hasClass('create')) {
14491457
self.createItem(null, function() {
@@ -1982,22 +1990,28 @@ $.extend(Selectize.prototype, {
19821990
self.removeItem(value, silent);
19831991
},
19841992

1985-
clearOptions: function(silent) {
1993+
clearOptions: function(silent = false, removeCurrentItems = true) {
19861994
var self = this;
19871995

19881996
self.loadedSearches = {};
19891997
self.userOptions = {};
19901998
self.renderCache = {};
1991-
var options = self.options;
1992-
$.each(self.options, function(key, value) {
1993-
if(self.items.indexOf(key) == -1) {
1994-
delete options[key];
1995-
}
1996-
});
1997-
self.options = self.sifter.items = options;
1999+
if (removeCurrentItems) {
2000+
self.options = self.sifter.items = {};
2001+
} else {
2002+
var options = self.options;
2003+
$.each(self.options, function(key, value) {
2004+
if(self.items.indexOf(key) == -1) {
2005+
delete options[key];
2006+
}
2007+
});
2008+
self.options = self.sifter.items = options;
2009+
}
19982010
self.lastQuery = null;
19992011
self.trigger('option_clear');
2000-
self.clear(silent);
2012+
if (removeCurrentItems) {
2013+
self.clear(silent);
2014+
}
20012015
},
20022016

20032017
getOption: function(value) {
@@ -2891,8 +2905,8 @@ $.fn.selectize = function (settings_user) {
28912905
}
28922906

28932907
var option = readData($option) || {};
2894-
option[field_label] = option[field_label] || $option.text();
28952908
option[field_value] = option[field_value] || value;
2909+
option[field_label] = option[field_label] || $option.text() || option[field_value];
28962910
option[field_disabled] = option[field_disabled] || $option.prop('disabled');
28972911
option[field_optgroup] = option[field_optgroup] || group;
28982912
option.styles = $option.attr('style') || '';

‎docs/static/js/selectize.min.js

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

0 commit comments

Comments
 (0)