Merge pull request #926 from caseyjhol/master

SelectAll/DeselectAll (Fix #721, Fix #901, fix #921)
snapappointments · Feb 18, 2015 · c7b43c1 · c7b43c1
2 parents c621730 + 539400a
commit c7b43c1
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 28 deletions.
diff --git a/dist/css/bootstrap-select.css b/dist/css/bootstrap-select.css
diff --git a/dist/css/bootstrap-select.css.map b/dist/css/bootstrap-select.css.map
diff --git a/dist/css/bootstrap-select.min.css b/dist/css/bootstrap-select.min.css
diff --git a/dist/js/bootstrap-select.js b/dist/js/bootstrap-select.js
@@ -325,7 +325,7 @@
       (null === this.options.liveSearchPlaceholder ? '' : ' placeholder="' + htmlEscape(this.options.liveSearchPlaceholder) + '"') + '>' +
       '</div>'
           : '';
-      var actionsbox = this.options.actionsBox ?
+      var actionsbox = this.multiple && this.options.actionsBox ?
       '<div class="bs-actionsbox">' +
       '<div class="btn-group btn-group-sm btn-block">' +
       '<button class="actions-btn bs-select-all btn btn-default">' +
@@ -337,7 +337,8 @@
       '</div>' +
       '</div>'
           : '';
-      var donebutton = this.multiple && this.options.doneButton ? '<div class="bs-donebutton">' +
+      var donebutton = this.multiple && this.options.doneButton ?
+      '<div class="bs-donebutton">' +
       '<div class="btn-group btn-block">' +
       '<button class="btn btn-sm btn-default">' +
       this.options.doneButtonText +
@@ -1056,12 +1057,16 @@
 
     selectAll: function () {
       this.findLis();
-      this.$lis.not('.divider').not('.disabled').not('.selected').filter(':visible').find('a').click();
+      this.$element.find('option:enabled').not('[data-divider]').not('[data-hidden]').prop('selected', true);
+      this.$lis.not('.divider').not('.dropdown-header').not('.disabled').not('.hidden').addClass('selected');
+      this.render(false);
     },
 
     deselectAll: function () {
       this.findLis();
-      this.$lis.not('.divider').not('.disabled').filter('.selected').filter(':visible').find('a').click();
+      this.$element.find('option:enabled').not('[data-divider]').not('[data-hidden]').prop('selected', false);
+      this.$lis.not('.divider').not('.dropdown-header').not('.disabled').not('.hidden').removeClass('selected');
+      this.render(false);
     },
 
     keydown: function (e) {

diff --git a/dist/js/bootstrap-select.js.map b/dist/js/bootstrap-select.js.map
diff --git a/dist/js/bootstrap-select.min.js b/dist/js/bootstrap-select.min.js
diff --git a/js/bootstrap-select.js b/js/bootstrap-select.js
@@ -1051,12 +1051,16 @@
 
     selectAll: function () {
       this.findLis();
-      this.$lis.not('.divider').not('.disabled').not('.selected').filter(':visible').find('a').click();
+      this.$element.find('option:enabled').not('[data-divider]').not('[data-hidden]').prop('selected', true);
+      this.$lis.not('.divider').not('.dropdown-header').not('.disabled').not('.hidden').addClass('selected');
+      this.render(false);
     },
 
     deselectAll: function () {
       this.findLis();
-      this.$lis.not('.divider').not('.disabled').filter('.selected').filter(':visible').find('a').click();
+      this.$element.find('option:enabled').not('[data-divider]').not('[data-hidden]').prop('selected', false);
+      this.$lis.not('.divider').not('.dropdown-header').not('.disabled').not('.hidden').removeClass('selected');
+      this.render(false);
     },
 
     keydown: function (e) {