Skip to content

Improve setValue/addItems performance #433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 1, 2014
Merged

Improve setValue/addItems performance #433

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5e09c91
Delaying updating attributes and caret during bulk insertion
Scottmitch May 22, 2014
30a3c0e
Consolidated the refreshState call to capture just becoming full duri…
Scottmitch May 22, 2014
0bc0b63
Used method call to isFull to avoid duplicate code
Scottmitch May 22, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 20 additions & 15 deletions src/selectize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1282,7 +1282,7 @@ $.extend(Selectize.prototype, {
var $item, $option, $options;
var self = this;
var inputMode = self.settings.mode;
var i, active, value_next;
var i, active, value_next, wasFull;
value = hash_key(value);

if (self.items.indexOf(value) !== -1) {
Expand All @@ -1295,15 +1295,18 @@ $.extend(Selectize.prototype, {
if (inputMode === 'multi' && self.isFull()) return;

$item = $(self.render('item', self.options[value]));
wasFull = self.isFull();
self.items.splice(self.caretPos, 0, value);
self.insertAtCaret($item);
self.refreshState();
if (!self.isPending || (!wasFull && self.isFull())) {
self.refreshState();
}

if (self.isSetup) {
$options = self.$dropdown_content.find('[data-selectable]');

// update menu / remove the option (if this is not one item being added as part of series)
if (!this.isPending) {
if (!self.isPending) {
$option = self.getOption(value);
value_next = self.getAdjacentOption($option, 1).attr('data-value');
self.refreshOptions(self.isFocused && inputMode !== 'single');
Expand All @@ -1313,7 +1316,7 @@ $.extend(Selectize.prototype, {
}

// hide the menu if the maximum number of items have been selected or no options are left
if (!$options.length || (self.settings.maxItems !== null && self.items.length >= self.settings.maxItems)) {
if (!$options.length || self.isFull()) {
self.close();
} else {
self.positionDropdown();
Expand Down Expand Up @@ -1751,17 +1754,19 @@ $.extend(Selectize.prototype, {
i = Math.max(0, Math.min(self.items.length, i));
}

// the input must be moved by leaving it in place and moving the
// siblings, due to the fact that focus cannot be restored once lost
// on mobile webkit devices
var j, n, fn, $children, $child;
$children = self.$control.children(':not(input)');
for (j = 0, n = $children.length; j < n; j++) {
$child = $($children[j]).detach();
if (j < i) {
self.$control_input.before($child);
} else {
self.$control.append($child);
if(!self.isPending) {
// the input must be moved by leaving it in place and moving the
// siblings, due to the fact that focus cannot be restored once lost
// on mobile webkit devices
var j, n, fn, $children, $child;
$children = self.$control.children(':not(input)');
for (j = 0, n = $children.length; j < n; j++) {
$child = $($children[j]).detach();
if (j < i) {
self.$control_input.before($child);
} else {
self.$control.append($child);
}
}
}

Expand Down