Skip to content
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

New refreshOptions method for refreshing the options. #564

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

New refreshOptions method for refreshing the options. #564

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3cad423
0.9.14: New refreshOptions method for refreshing the options based on…
ikkala Jun 16, 2015
2f94bf0
Bug fix: this.query was not emptied when search clear button is pressed.
ikkala Jun 22, 2015
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
2 changes: 1 addition & 1 deletion bower.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "bootstrap-multiselect",
"description": "Twitter Bootstrap plugin to make selects user friendly.",
"homepage": "http://davidstutz.github.io/bootstrap-multiselect/",
"version": "0.9.13",
"version": "0.9.14",
"keywords": [
"js",
"css",
Expand Down
129 changes: 73 additions & 56 deletions dist/js/bootstrap-multiselect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@
this.originalOptions = this.$select.clone()[0].options;
this.query = '';
this.searchTimeout = null;
this.lastToggledInput = null
this.lastToggledInput = null;

this.options.multiple = this.$select.attr('multiple') === "multiple";
this.options.onChange = $.proxy(this.options.onChange, this);
Expand All @@ -176,7 +176,7 @@
}

this.$select.hide().after(this.$container);
};
}

Multiselect.prototype = {

Expand Down Expand Up @@ -513,7 +513,7 @@
$optionsNotThis.closest("a").css("outline", "");
}
}
else {
else if ($option) {
// Unselect option.
$option.prop('selected', false);
}
Expand Down Expand Up @@ -839,6 +839,7 @@
var clearBtn = $(this.options.templates.filterClearBtn);
clearBtn.on('click', $.proxy(function(event){
clearTimeout(this.searchTimeout);
this.query = '';
this.$filter.find('.multiselect-search').val('');
$('li', this.$ul).show().removeClass("filter-hidden");
this.updateSelectAll();
Expand All @@ -863,65 +864,72 @@

if (this.query !== event.target.value) {
this.query = event.target.value;

var currentGroup, currentGroupVisible;
$.each($('li', this.$ul), $.proxy(function(index, element) {
var value = $('input', element).length > 0 ? $('input', element).val() : "";
var text = $('label', element).text();

var filterCandidate = '';
if ((this.options.filterBehavior === 'text')) {
filterCandidate = text;
}
else if ((this.options.filterBehavior === 'value')) {
filterCandidate = value;
}
else if (this.options.filterBehavior === 'both') {
filterCandidate = text + '\n' + value;
}

if (value !== this.options.selectAllValue && text) {
// By default lets assume that element is not
// interesting for this search.
var showElement = false;

if (this.options.enableCaseInsensitiveFiltering && filterCandidate.toLowerCase().indexOf(this.query.toLowerCase()) > -1) {
showElement = true;
}
else if (filterCandidate.indexOf(this.query) > -1) {
showElement = true;
}

// Toggle current element (group or group item) according to showElement boolean.
$(element).toggle(showElement).toggleClass('filter-hidden', !showElement);

// Differentiate groups and group items.
if ($(element).hasClass('multiselect-group')) {
// Remember group status.
currentGroup = element;
currentGroupVisible = showElement;
}
else {
// Show group name when at least one of its items is visible.
if (showElement) {
$(currentGroup).show().removeClass('filter-hidden');
}

// Show all group items when group name satisfies filter.
if (!showElement && currentGroupVisible) {
$(element).show().removeClass('filter-hidden');
}
}
}
}, this));
this.updateVisibilityByFilter();
}

this.updateSelectAll();
}, this), 300, this);
}, this));
}
}
},

/**
* Update visibilities of the options
*/
updateVisibilityByFilter: function () {
var currentGroup, currentGroupVisible;
$.each($('li', this.$ul), $.proxy(function (index, element) {
var value = $('input', element).length > 0 ? $('input', element).val() : "";
var text = $('label', element).text();

var filterCandidate = '';
if ((this.options.filterBehavior === 'text')) {
filterCandidate = text;
}
else if ((this.options.filterBehavior === 'value')) {
filterCandidate = value;
}
else if (this.options.filterBehavior === 'both') {
filterCandidate = text + '\n' + value;
}

if (value !== this.options.selectAllValue && text) {
// By default lets assume that element is not
// interesting for this search.
var showElement = false;

if (this.options.enableCaseInsensitiveFiltering && filterCandidate.toLowerCase().indexOf(this.query.toLowerCase()) > -1) {
showElement = true;
}
else if (filterCandidate.indexOf(this.query) > -1) {
showElement = true;
}

// Toggle current element (group or group item) according to showElement boolean.
$(element).toggle(showElement).toggleClass('filter-hidden', !showElement);

// Differentiate groups and group items.
if ($(element).hasClass('multiselect-group')) {
// Remember group status.
currentGroup = element;
currentGroupVisible = showElement;
}
else {
// Show group name when at least one of its items is visible.
if (showElement) {
$(currentGroup).show().removeClass('filter-hidden');
}

// Show all group items when group name satisfies filter.
if (!showElement && currentGroupVisible) {
$(element).show().removeClass('filter-hidden');
}
}
}
}, this));

this.updateSelectAll();
},

/**
* Unbinds the whole plugin.
Expand All @@ -931,9 +939,18 @@
this.$select.show();
this.$select.data('multiselect', null);
},

/**
* Refreshes the multiselect options based on the option of the select element.
*/
refreshOptions: function () {
this.$ul.children('li').not('.filter').remove();
this.buildDropdownOptions();
this.updateVisibilityByFilter();
},

/**
* Refreshs the multiselect based on the selected options of the select.
* Refreshes the multiselect based on the selected options of the select element.
*/
refresh: function() {
$('option', this.$select).each($.proxy(function(index, element) {
Expand Down
21 changes: 21 additions & 0 deletions tests/spec/bootstrap-multiselect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,27 @@ describe('Bootstrap Multiselect "Core".', function() {
}
});

it('Should preserve the checkbox selections after using refreshOptions.', function () {
var $select = $('#multiselect');
for (var i = 100; i < 110; i++) {
var $option = $('<option value="' + i + '">' + i + '</option>');
$select.append($option);
}

expect($('#multiselect option').length).toBe(109);
expect($('#multiselect-container input[type="checkbox"]').length).toBe(99);

$('#multiselect').multiselect('refreshOptions');

expect($('#multiselect option').length).toBe(109);
expect($('#multiselect-container input[type="checkbox"]').length).toBe(109);
expect($('#multiselect-container input[type="checkbox"]:checked').length).toBe(9);

for (var i = 1; i < 10; i++) {
expect($('#multiselect option[value="' + i + '"]').prop('selected')).toBe(true);
}
});

it('Should remove container, button and ul after destroy.', function() {
$('#multiselect').multiselect('destroy');

Expand Down