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

Improvement for big select + bugfix #180

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

Improvement for big select + bugfix #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
de3ab83
[FEATURE] Improve initial rendering for big select
Mar 20, 2015
90b922f
[BUGFIX] Option value can't be a integer
Mar 20, 2015
23d094b
[TASK] Renaming function generateLisFromOption to generateListFromOption
May 14, 2015
04c8226
[BUGFIX] Option groups are not rendering with improved version
May 14, 2015
5cd96ea
[TASK] Resolve conflict with master branch and fixe jasmine tests
codesource Nov 9, 2020
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
101 changes: 60 additions & 41 deletions js/jquery.multi-select.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,22 @@
ms.attr('id', ms.attr('id') ? ms.attr('id') : Math.ceil(Math.random()*1000)+'multiselect');
this.$container.attr('id', 'ms-'+ms.attr('id'));
this.$container.addClass(that.options.cssClass);
ms.find('option').each(function(){
that.generateLisFromOption(this);
var handler = {
selectableUl: [],
selectionUl: [],
selectableOptgroups: {},
selectionOptgroups: {}
};
ms.find('option').each(function(index){
that.generateListFromOption(this, index, null, handler);
});
that.$selectableUl.prepend(handler.selectableUl.join(''));
that.$selectionUl.prepend(handler.selectionUl.join(''));
for(var optgroupId in handler.selectableOptgroups){
that.$selectableUl.find('#optgroup-selectable-'+optgroupId+' ul.ms-optgroup').append(handler.selectableOptgroups[optgroupId].join(''));
that.$selectionUl.find('#optgroup-selection-'+optgroupId+' ul.ms-optgroup').append(handler.selectionOptgroups[optgroupId].join(''));
}
handler = null;

this.$selectionUl.find('.ms-optgroup-label').hide();

Expand Down Expand Up @@ -95,7 +108,7 @@
}
},

'generateLisFromOption' : function(option, index, $container){
'generateListFromOption' : function(option, index, $container, $handler){
var that = this,
ms = that.$element,
attributes = "",
Expand All @@ -108,35 +121,25 @@
attributes += attr.name+'="'+attr.value+'" ';
}
}
var selectableLi = $('<li '+attributes+'><span>'+that.escapeHTML($option.text())+'</span></li>'),
selectedLi = selectableLi.clone(),
value = $option.val(),
elementId = that.sanitize(value);

selectableLi
.data('ms-value', value)
.addClass('ms-elem-selectable')
.attr('id', elementId+'-selectable');

selectedLi
.data('ms-value', value)
.addClass('ms-elem-selection')
.attr('id', elementId+'-selection')
.hide();

if ($option.attr('disabled') || ms.attr('disabled')){
selectedLi.addClass(that.options.disabledClass);
selectableLi.addClass(that.options.disabledClass);
}

var value = $option.val(),
elementId = that.sanitize(value),
elementText = that.escapeHTML($option.text()),
elementDisabled = $option.prop('disabled') || ms.prop('disabled'),
elementSelected = $option.prop('selected') ? true : false,
selectableLi = '<li '+attributes+' data-ms-value="'+value+'" class="ms-elem-selectable'+(elementDisabled?' '+that.options.disabledClass:'')+(elementSelected?' ms-selected':'')+'" id="ms-elem-'+elementId+'-selectable"><span>'+elementText+'</span></li>',
selectedLi = '<li '+attributes+' data-ms-value="'+value+'" class="ms-elem-selection'+(elementDisabled?' '+that.options.disabledClass:'')+(elementSelected?' ms-selected':'')+'" id="ms-elem-'+elementId+'-selection" style="display:none;"><span>'+elementText+'</span></li>';


var $optgroup = $option.parent('optgroup');
var hasHandler = typeof $handler === 'object';

if ($optgroup.length > 0){
var optgroupLabel = $optgroup.attr('label'),
optgroupId = that.sanitize(optgroupLabel),
$selectableOptgroup = that.$selectableUl.find('#optgroup-selectable-'+optgroupId),
$selectionOptgroup = that.$selectionUl.find('#optgroup-selection-'+optgroupId);

if ($selectableOptgroup.length === 0){
var optgroupContainerTpl = '<li class="ms-optgroup-container"></li>',
optgroupTpl = '<ul class="ms-optgroup"><li class="ms-optgroup-label"><span>'+optgroupLabel+'</span></li></ul>';
Expand All @@ -159,15 +162,31 @@
}
that.$selectableUl.append($selectableOptgroup);
that.$selectionUl.append($selectionOptgroup);

if(hasHandler){
$handler.selectableOptgroups[optgroupId] = [];
$handler.selectionOptgroups[optgroupId] = [];
}
}
if(hasHandler){
index = index == undefined ? $handler.selectableOptgroups[optgroupId].length : index;
$handler.selectableOptgroups[optgroupId].splice(index, 0, selectableLi);
$handler.selectionOptgroups[optgroupId].splice(index, 0, selectedLi);
}else{
index = index == undefined ? $selectableOptgroup.find('ul').children().length : index + 1;
$(selectableLi).insertAt(index, $selectableOptgroup.children());
$(selectedLi).insertAt(index, $selectionOptgroup.children());
}
index = index === undefined ? $selectableOptgroup.find('ul').children().length : index + 1;
selectableLi.insertAt(index, $selectableOptgroup.children());
selectedLi.insertAt(index, $selectionOptgroup.children());
} else {
index = index === undefined ? that.$selectableUl.children().length : index;

selectableLi.insertAt(index, that.$selectableUl);
selectedLi.insertAt(index, that.$selectionUl);
if(hasHandler){
index = index == undefined ? $handler.selectableUl.length : index;
$handler.selectableUl.splice(index, 0, selectableLi);
$handler.selectionUl.splice(index, 0, selectedLi);
}else{
index = index == undefined ? that.$selectableUl.children().length : index;
$(selectableLi).insertAt(index, that.$selectableUl);
$(selectedLi).insertAt(index, that.$selectionUl);
}
}
},

Expand All @@ -193,7 +212,7 @@
}

$option.insertAt(index, $container);
that.generateLisFromOption($option.get(0), index, option.nested);
that.generateListFromOption($option.get(0), index, option.nested);
}
});
},
Expand Down Expand Up @@ -297,7 +316,7 @@
}
if ($nextElem.length > 0){
$nextElem.addClass('ms-hover');
var scrollTo = $list.scrollTop() + $nextElem.position().top -
var scrollTo = $list.scrollTop() + $nextElem.position().top -
containerHeight / 2 + elemHeight / 2;

$list.scrollTop(scrollTo);
Expand Down Expand Up @@ -354,18 +373,18 @@
},

'select' : function(value, method){
if (typeof value === 'string'){ value = [value]; }
if (typeof value === 'string' || typeof value === 'number'){ value = [''+value]; }

var that = this,
ms = this.$element,
msIds = $.map(value, function(val){ return(that.sanitize(val)); }),
selectables = this.$selectableUl.find('#' + msIds.join('-selectable, #')+'-selectable').filter(':not(.'+that.options.disabledClass+')'),
selections = this.$selectionUl.find('#' + msIds.join('-selection, #') + '-selection').filter(':not(.'+that.options.disabledClass+')'),
selectables = this.$selectableUl.find('#ms-elem-' + msIds.join('-selectable, #ms-elem-')+'-selectable').filter(':not(.'+that.options.disabledClass+')'),
selections = this.$selectionUl.find('#ms-elem-' + msIds.join('-selection, #ms-elem-') + '-selection').filter(':not(.'+that.options.disabledClass+')'),
options = ms.find('option:not(:disabled)').filter(function(){ return($.inArray(this.value, value) > -1); });

if (method === 'init'){
selectables = this.$selectableUl.find('#' + msIds.join('-selectable, #')+'-selectable'),
selections = this.$selectionUl.find('#' + msIds.join('-selection, #') + '-selection');
selectables = this.$selectableUl.find('#ms-elem-' + msIds.join('-selectable, #ms-elem-')+'-selectable'),
selections = this.$selectionUl.find('#ms-elem-' + msIds.join('-selection, #ms-elem-') + '-selection');
}

if (selectables.length > 0){
Expand Down Expand Up @@ -410,13 +429,13 @@
},

'deselect' : function(value){
if (typeof value === 'string'){ value = [value]; }
if (typeof value === 'string' || typeof value === 'number'){ value = [''+value]; }

var that = this,
ms = this.$element,
msIds = $.map(value, function(val){ return(that.sanitize(val)); }),
selectables = this.$selectableUl.find('#' + msIds.join('-selectable, #')+'-selectable'),
selections = this.$selectionUl.find('#' + msIds.join('-selection, #')+'-selection').filter('.ms-selected').filter(':not(.'+that.options.disabledClass+')'),
selectables = this.$selectableUl.find('#ms-elem-' + msIds.join('-selectable, #ms-elem-')+'-selectable'),
selections = this.$selectionUl.find('#ms-elem-' + msIds.join('-selection, #ms-elem-')+'-selection').filter('.ms-selected').filter(':not(.'+that.options.disabledClass+')'),
options = ms.find('option').filter(function(){ return($.inArray(this.value, value) > -1); });

if (selections.length > 0){
Expand Down
12 changes: 6 additions & 6 deletions test/spec/multiSelectSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ describe("multiSelect", function() {

it ('should select the pre-selected options', function(){
$.each(selectedValues, function(index, value){
expect($('.ms-selectable ul.ms-list li#'+sanitize(value)+'-selectable')).toBe('.ms-selected');
expect($('.ms-selectable ul.ms-list li#ms-elem-'+sanitize(value)+'-selectable')).toBe('.ms-selected');
});
expect($('.ms-selectable ul.ms-list li.ms-selected').length).toEqual(2);
});
Expand All @@ -75,7 +75,7 @@ describe("multiSelect", function() {

it ('should select the disabled pre-selected options', function(){
$.each(selectedValues, function(index, value){
expect($('.ms-selectable ul.ms-list li#'+sanitize(value)+'-selectable')).toBe('.ms-selected');
expect($('.ms-selectable ul.ms-list li#ms-elem-'+sanitize(value)+'-selectable')).toBe('.ms-selected');
});
expect($('.ms-selectable ul.ms-list li.ms-selected').length).toEqual(3);
});
Expand All @@ -95,7 +95,7 @@ describe("multiSelect", function() {

it ('should not select the disabled non-selected options', function(){
$.each(selectedValues, function(index, value){
expect($('.ms-selectable ul.ms-list li#'+sanitize(value)+'-selectable')).toBe('.ms-selected');
expect($('.ms-selectable ul.ms-list li#ms-elem-'+sanitize(value)+'-selectable')).toBe('.ms-selected');
});
expect($('.ms-selectable ul.ms-list li.ms-selected').length).toEqual(2);
});
Expand Down Expand Up @@ -226,7 +226,7 @@ describe("multiSelect", function() {
});

it('should show the associated selected item', function(){
expect($('#'+sanitize(value)+'-selection')).toBe(':visible');
expect($('#ms-elem-'+sanitize(value)+'-selection')).toBe(':visible');
});

it('should trigger the original select change event', function(){
Expand Down Expand Up @@ -264,7 +264,7 @@ describe("multiSelect", function() {
});

it('should not show the associated selected item', function(){
expect($('#'+sanitize(value)+'-selection')).not.toBe(':visible');
expect($('#ms-elem-'+sanitize(value)+'-selection')).not.toBe(':visible');
});

it('should not trigger the original select change event', function(){
Expand Down Expand Up @@ -328,7 +328,7 @@ describe("multiSelect", function() {
});

it('should show associated selectable item', function(){
expect($('#'+sanitize(value)+'-selectable')).toBe(':visible');
expect($('#ms-elem-'+sanitize(value)+'-selectable')).toBe(':visible');
});

it('should remove the .ms-selected class to the corresponding selectable item', function(){
Expand Down