diff options
| author | lou <louiscuny@gmail.com> | 2011-09-16 14:34:47 +0200 |
|---|---|---|
| committer | lou <louiscuny@gmail.com> | 2011-09-16 14:35:39 +0200 |
| commit | 741a6dbe40c5801822078b8e3f12c43dba7ac6b7 (patch) | |
| tree | 8b12b74426c0b6ca78606f3a0d71b7ffadd35b31 | |
| parent | 985ed6c008a620890e99c491f01cef60f2a10415 (diff) | |
| parent | ffb71ad07d8bbdf98ebbf6e1c02325a45f56332e (diff) | |
| download | multi-select-741a6dbe40c5801822078b8e3f12c43dba7ac6b7.zip multi-select-741a6dbe40c5801822078b8e3f12c43dba7ac6b7.tar.gz multi-select-741a6dbe40c5801822078b8e3f12c43dba7ac6b7.tar.bz2 | |
Merge branch 'master' into gh-pages
| -rw-r--r-- | css/multi-select.css | 3 | ||||
| -rw-r--r-- | js/application.js | 2 | ||||
| -rw-r--r-- | js/jquery.multi-select.js | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/css/multi-select.css b/css/multi-select.css index 5692141..047809f 100644 --- a/css/multi-select.css +++ b/css/multi-select.css @@ -16,6 +16,9 @@ -khtml-border-radius: 4px; } +.ms-selected{ + display:none; +} .ms-container .ms-selectable{ margin-right: 40px; } diff --git a/js/application.js b/js/application.js index 0f2da73..a0c759f 100644 --- a/js/application.js +++ b/js/application.js @@ -17,7 +17,7 @@ selectableHeader : '<input type="text" id="search" autocomplete = "off" />' }); - $('input#search').quicksearch('#ms-searchable-form .ms-selectable li:not(.ms-disabled)'); + $('input#search').quicksearch('#ms-searchable-form .ms-selectable li:not(.ms-diselected)'); $('#searchable-form').multiSelect(); diff --git a/js/jquery.multi-select.js b/js/jquery.multi-select.js index 9fae41d..b6c91b0 100644 --- a/js/jquery.multi-select.js +++ b/js/jquery.multi-select.js @@ -100,6 +100,7 @@ if (parentOptgroup.length > 0) if (parentOptgroup.children('.ms-elem-selectable:not(:hidden)').length == 1) parentOptgroup.children('.ms-optgroup-label').hide(); + selectableLi.addClass('ms-selected'); selectableLi.hide(); selectedOption.attr('selected', 'selected'); if(titleAttr){ @@ -138,6 +139,7 @@ parentOptgroup.children('.ms-optgroup-label').show(); selectedOption.removeAttr('selected'); selectableLi.show(); + selectableLi.removeClass('ms-selected'); selectedLi.remove(); if (ms.data('settings').emptyArray && selectedUl.children('li').length == 0){ if (ms.find("option[value='']")){ |