Merge pull request #715 from cwalv/patch-1

only use disabledText when multiselect is disabled

Merge pull request #715 from cwalv/patch-1
only use disabledText when multiselect is disabled
31e1ea69 · David Stutz · 08c7013e · 5d68e6f9 · 31e1ea69
Commit 31e1ea69 authored Apr 19, 2016 by David Stutz
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

bootstrap-multiselect.js dist/js/bootstrap-multiselect.js +2 -3

No files found.
--- a/dist/js/bootstrap-multiselect.js
+++ b/dist/js/bootstrap-multiselect.js
@@ -234,9 +234,8 @@
             * @returns {String}
             */
            buttonText: function(options, select) {
-                if (this.disabledText.length > 0 
+                if (this.disabledText.length > 0
-                        && (this.disableIfEmpty || select.prop('disabled')) 
+                        && (select.prop('disabled') || (options.length == 0 && this.disableIfEmpty))  {
-                        && options.length == 0) {
                    return this.disabledText;
                }