summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwenzhixin <wenzhixin2010@gmail.com>2015-12-09 23:09:03 +0800
committerwenzhixin <wenzhixin2010@gmail.com>2015-12-09 23:09:03 +0800
commit324afe0d4605d708b740b18bf0aa02e867e64d54 (patch)
treeee24789718364d8ae61d36329f94b434cd1cad32
parent8b2b4171b5c6641ab9c3ca98aaaeddadc8302171 (diff)
parent06b28819601af43fe24041d842cd7bbec2252993 (diff)
downloadmultiple-select-324afe0d4605d708b740b18bf0aa02e867e64d54.zip
multiple-select-324afe0d4605d708b740b18bf0aa02e867e64d54.tar.gz
multiple-select-324afe0d4605d708b740b18bf0aa02e867e64d54.tar.bz2
Merge pull request #259 from alexisgayte/master
fixed #193: diseable issue
-rw-r--r--multiple-select.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/multiple-select.js b/multiple-select.js
index 25cb16a..d811b28 100644
--- a/multiple-select.js
+++ b/multiple-select.js
@@ -480,11 +480,13 @@
setSelects: function (values) {
var that = this;
this.$selectItems.prop('checked', false);
+ this.$disableItems.prop('checked', false);
$.each(values, function (i, value) {
that.$selectItems.filter(sprintf('[value="%s"]', value)).prop('checked', true);
+ that.$disableItems.filter(sprintf('[value="%s"]', value)).prop('checked', true);
});
this.$selectAll.prop('checked', this.$selectItems.length ===
- this.$selectItems.filter(':checked').length);
+ this.$selectItems.filter(':checked').length + this.$disableItems.filter(':checked').length);
$.each(that.$selectGroups, function (i, val) {
var group = $(val).parent().attr('data-group'),