Skip to content

Commit 9cabf37

Browse files
committed
Marking JqueryUI as a peer dep (optional)
1 parent 6980fd7 commit 9cabf37

File tree

103 files changed

+65
-34
lines changed

Some content is hidden

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

103 files changed

+65
-34
lines changed

dist/js/selectize.js

+37-26
Original file line numberDiff line numberDiff line change
@@ -1248,6 +1248,13 @@ function uaDetect(platform, re) {
12481248
return re.test(navigator.userAgent);
12491249
}
12501250

1251+
/**
1252+
*
1253+
* Selectize instance
1254+
* @param {JQuery} $input Jquery object of target element to Selectized
1255+
* @param {Object} settings Options to apply for selectized element
1256+
*
1257+
*/
12511258
var Selectize = function($input, settings) {
12521259
var key, i, n, dir, input, self = this;
12531260
input = $input[0];
@@ -1256,7 +1263,9 @@ var Selectize = function($input, settings) {
12561263
// detect rtl environment
12571264
var computedStyle = window.getComputedStyle && window.getComputedStyle(input, null);
12581265
dir = computedStyle ? computedStyle.getPropertyValue('direction') : input.currentStyle && input.currentStyle.direction;
1259-
dir = dir || $input.parents('[dir]:first').attr('dir') || '';
1266+
dir = dir || $input.parents('[dir]:first').attr('dir') || '';
1267+
1268+
self.settings = {};
12601269

12611270
// setup default state
12621271
$.extend(self, {
@@ -2488,11 +2497,13 @@ $.extend(Selectize.prototype, {
24882497
for (i = 0, n = self.items.length; i < n; i++) {
24892498
self.getOption(self.items[i]).addClass('selected');
24902499
}
2491-
}
2500+
}
24922501

2493-
if (self.settings.dropdownSize.sizeType !== 'auto' && self.isOpen) {
2494-
self.setupDropdownHeight();
2495-
}
2502+
if (self.settings.dropdownSize.sizeType !== 'auto' && self.isOpen) {
2503+
self.setupDropdownHeight();
2504+
}
2505+
2506+
self.positionDropdown();
24962507

24972508
// add create option
24982509
has_create_option = self.canCreate(query);
@@ -2505,23 +2516,24 @@ $.extend(Selectize.prototype, {
25052516

25062517
// activate
25072518
self.hasOptions = results.items.length > 0 || ( has_create_option && self.settings.showAddOptionOnCreate ) || self.settings.setFirstOptionActive;
2519+
25082520
if (self.hasOptions) {
2509-
if (results.items.length > 0) {
2510-
$active_before = active_before && self.getOption(active_before);
2511-
if (results.query !== "" && self.settings.setFirstOptionActive) {
2512-
$active = $dropdown_content.find('[data-selectable]:first')
2513-
} else if (results.query !== "" && $active_before && $active_before.length) {
2514-
$active = $active_before;
2515-
} else if (self.settings.mode === 'single' && self.items.length) {
2516-
$active = self.getOption(self.items[0]);
2517-
}
2518-
if (!$active || !$active.length) {
2519-
if ($create && !self.settings.addPrecedence) {
2520-
$active = self.getAdjacentOption($create, 1);
2521-
} else {
2522-
$active = $dropdown_content.find('[data-selectable]:first');
2523-
}
2524-
}
2521+
if (results.items.length > 0) {
2522+
$active_before = active_before && self.getOption(active_before);
2523+
if (results.query !== "" && self.settings.setFirstOptionActive) {
2524+
$active = $dropdown_content.find('[data-selectable]:first')
2525+
} else if (results.query !== "" && $active_before && $active_before.length) {
2526+
$active = $active_before;
2527+
} else if (self.settings.mode === 'single' && self.items.length) {
2528+
$active = self.getOption(self.items[0]);
2529+
}
2530+
if (!$active || !$active.length) {
2531+
if ($create && !self.settings.addPrecedence) {
2532+
$active = self.getAdjacentOption($create, 1);
2533+
} else {
2534+
$active = $dropdown_content.find('[data-selectable]:first');
2535+
}
2536+
}
25252537
} else {
25262538
$active = $create;
25272539
}
@@ -3213,9 +3225,8 @@ $.extend(Selectize.prototype, {
32133225
self.focus();
32143226
self.isOpen = true;
32153227
self.refreshState();
3216-
self.$dropdown.css({ visibility: 'hidden', display: 'block' });
3217-
self.setupDropdownHeight();
3218-
self.positionDropdown();
3228+
self.$dropdown.css({ visibility: 'hidden', display: 'block' });
3229+
self.setupDropdownHeight();
32193230
self.$dropdown.css({visibility: 'visible'});
32203231
self.trigger('dropdown_open', self.$dropdown);
32213232
},
@@ -3761,8 +3772,8 @@ Selectize.defaults = {
37613772

37623773
copyClassesToDropdown: true,
37633774
dropdownSize: {
3764-
sizeType: 'auto', // 'numberItems' or 'fixedHeight'
3765-
sizeValue: 'auto', // number of items or height value (px is default) or CSS height (px, rem, em, vh)
3775+
sizeType: 'auto',
3776+
sizeValue: 'auto',
37663777
},
37673778

37683779
ignoreOnDropwdownHeight: 'img, i',

dist/js/selectize.min.js

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

dist/lib/bootstrap2/accordion.less

100755100644
File mode changed.

dist/lib/bootstrap2/alerts.less

100755100644
File mode changed.

dist/lib/bootstrap2/bootstrap.less

100755100644
File mode changed.

dist/lib/bootstrap2/breadcrumbs.less

100755100644
File mode changed.

dist/lib/bootstrap2/button-groups.less

100755100644
File mode changed.

dist/lib/bootstrap2/buttons.less

100755100644
File mode changed.

dist/lib/bootstrap2/carousel.less

100755100644
File mode changed.

dist/lib/bootstrap2/close.less

100755100644
File mode changed.

dist/lib/bootstrap2/code.less

100755100644
File mode changed.

dist/lib/bootstrap2/component-animations.less

100755100644
File mode changed.

dist/lib/bootstrap2/dropdowns.less

100755100644
File mode changed.

dist/lib/bootstrap2/forms.less

100755100644
File mode changed.

dist/lib/bootstrap2/grid.less

100755100644
File mode changed.

dist/lib/bootstrap2/hero-unit.less

100755100644
File mode changed.

dist/lib/bootstrap2/labels-badges.less

100755100644
File mode changed.

dist/lib/bootstrap2/layouts.less

100755100644
File mode changed.

dist/lib/bootstrap2/media.less

100755100644
File mode changed.

dist/lib/bootstrap2/mixins.less

100755100644
File mode changed.

dist/lib/bootstrap2/modals.less

100755100644
File mode changed.

dist/lib/bootstrap2/navbar.less

100755100644
File mode changed.

dist/lib/bootstrap2/navs.less

100755100644
File mode changed.

dist/lib/bootstrap2/pager.less

100755100644
File mode changed.

dist/lib/bootstrap2/pagination.less

100755100644
File mode changed.

dist/lib/bootstrap2/popovers.less

100755100644
File mode changed.

dist/lib/bootstrap2/progress-bars.less

100755100644
File mode changed.

dist/lib/bootstrap2/reset.less

100755100644
File mode changed.

dist/lib/bootstrap2/responsive-1200px-min.less

100755100644
File mode changed.

dist/lib/bootstrap2/responsive-767px-max.less

100755100644
File mode changed.

dist/lib/bootstrap2/responsive-768px-979px.less

100755100644
File mode changed.

dist/lib/bootstrap2/responsive-navbar.less

100755100644
File mode changed.

dist/lib/bootstrap2/responsive-utilities.less

100755100644
File mode changed.

dist/lib/bootstrap2/responsive.less

100755100644
File mode changed.

dist/lib/bootstrap2/scaffolding.less

100755100644
File mode changed.

dist/lib/bootstrap2/sprites.less

100755100644
File mode changed.

dist/lib/bootstrap2/tables.less

100755100644
File mode changed.

dist/lib/bootstrap2/tests/buttons.html

100755100644
File mode changed.

dist/lib/bootstrap2/tests/css-tests.css

100755100644
File mode changed.

dist/lib/bootstrap2/tests/css-tests.html

100755100644
File mode changed.

dist/lib/bootstrap2/tests/forms-responsive.html

100755100644
File mode changed.

dist/lib/bootstrap2/tests/forms.html

100755100644
File mode changed.

dist/lib/bootstrap2/tests/navbar-fixed-top.html

100755100644
File mode changed.

dist/lib/bootstrap2/tests/navbar-static-top.html

100755100644
File mode changed.

dist/lib/bootstrap2/tests/navbar.html

100755100644
File mode changed.

dist/lib/bootstrap2/thumbnails.less

100755100644
File mode changed.

dist/lib/bootstrap2/tooltip.less

100755100644
File mode changed.

dist/lib/bootstrap2/type.less

100755100644
File mode changed.

dist/lib/bootstrap2/utilities.less

100755100644
File mode changed.

dist/lib/bootstrap2/variables.less

100755100644
File mode changed.

dist/lib/bootstrap2/wells.less

100755100644
File mode changed.

docs/docs/API/selectize.mdx

+12

lib/bootstrap2/accordion.less

100755100644
File mode changed.

lib/bootstrap2/alerts.less

100755100644
File mode changed.

lib/bootstrap2/bootstrap.less

100755100644
File mode changed.

lib/bootstrap2/breadcrumbs.less

100755100644
File mode changed.

lib/bootstrap2/button-groups.less

100755100644
File mode changed.

lib/bootstrap2/buttons.less

100755100644
File mode changed.

lib/bootstrap2/carousel.less

100755100644
File mode changed.

lib/bootstrap2/close.less

100755100644
File mode changed.

lib/bootstrap2/code.less

100755100644
File mode changed.

lib/bootstrap2/component-animations.less

100755100644
File mode changed.

lib/bootstrap2/dropdowns.less

100755100644
File mode changed.

lib/bootstrap2/forms.less

100755100644
File mode changed.

lib/bootstrap2/grid.less

100755100644
File mode changed.

lib/bootstrap2/hero-unit.less

100755100644
File mode changed.

lib/bootstrap2/labels-badges.less

100755100644
File mode changed.

lib/bootstrap2/layouts.less

100755100644
File mode changed.

lib/bootstrap2/media.less

100755100644
File mode changed.

lib/bootstrap2/mixins.less

100755100644
File mode changed.

lib/bootstrap2/modals.less

100755100644
File mode changed.

lib/bootstrap2/navbar.less

100755100644
File mode changed.

lib/bootstrap2/navs.less

100755100644
File mode changed.

lib/bootstrap2/pager.less

100755100644
File mode changed.

lib/bootstrap2/pagination.less

100755100644
File mode changed.

lib/bootstrap2/popovers.less

100755100644
File mode changed.

lib/bootstrap2/progress-bars.less

100755100644
File mode changed.

lib/bootstrap2/reset.less

100755100644
File mode changed.

lib/bootstrap2/responsive-1200px-min.less

100755100644
File mode changed.

lib/bootstrap2/responsive-767px-max.less

100755100644
File mode changed.

lib/bootstrap2/responsive-768px-979px.less

100755100644
File mode changed.

lib/bootstrap2/responsive-navbar.less

100755100644
File mode changed.

lib/bootstrap2/responsive-utilities.less

100755100644
File mode changed.

lib/bootstrap2/responsive.less

100755100644
File mode changed.

lib/bootstrap2/scaffolding.less

100755100644
File mode changed.

lib/bootstrap2/sprites.less

100755100644
File mode changed.

lib/bootstrap2/tables.less

100755100644
File mode changed.

lib/bootstrap2/tests/buttons.html

100755100644
File mode changed.

lib/bootstrap2/tests/css-tests.css

100755100644
File mode changed.

lib/bootstrap2/tests/css-tests.html

100755100644
File mode changed.

lib/bootstrap2/tests/forms-responsive.html

100755100644
File mode changed.

lib/bootstrap2/tests/forms.html

100755100644
File mode changed.

lib/bootstrap2/tests/navbar-fixed-top.html

100755100644
File mode changed.

lib/bootstrap2/tests/navbar-static-top.html

100755100644
File mode changed.

lib/bootstrap2/tests/navbar.html

100755100644
File mode changed.

lib/bootstrap2/thumbnails.less

100755100644
File mode changed.

lib/bootstrap2/tooltip.less

100755100644
File mode changed.

lib/bootstrap2/type.less

100755100644
File mode changed.

lib/bootstrap2/utilities.less

100755100644
File mode changed.

lib/bootstrap2/variables.less

100755100644
File mode changed.

lib/bootstrap2/wells.less

100755100644
File mode changed.

package-lock.json

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

package.json

+7-4
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"tag",
1212
"jquery-plugin"
1313
],
14-
"main": "dist/js/selectize.js",
14+
"browser": "dist/js/selectize.js",
1515
"description": "Selectize is a jQuery-based custom <select> UI control. Useful for tagging, contact lists, country selectors, etc.",
1616
"version": "0.15.2",
1717
"author": "Brian Reavis <[email protected]>",
@@ -64,11 +64,14 @@
6464
"popper.js": "1.16.1",
6565
"sass": "1.56.1"
6666
},
67-
"optionalDependencies": {
67+
"peerDependencies": {
68+
"jquery": "^1.7.0 || ^2 || ^3",
6869
"jquery-ui": "^1.13.2"
6970
},
70-
"peerDependencies": {
71-
"jquery": "^1.7.0 || ^2 || ^3"
71+
"peerDependenciesMeta": {
72+
"jquery-ui": {
73+
"optional": true
74+
}
7275
},
7376
"scripts": {
7477
"test": "karma start",

0 commit comments

Comments
 (0)