Skip to content

B
bootstrap-multiselect
Commit 5d68e6f9 authored by Charlie Arnold's avatar Charlie Arnold
Browse files
Options

only use disabledText when multiselect is disabled 

Fixes #714
parent 03582561
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
dist/js/bootstrap-multiselect.js
View file @ 5d68e6f9
...@@ -230,9 +230,8 @@ ...@@ -230,9 +230,8 @@
* @returns {String} * @returns {String}
*/ */
buttonText: function(options, select) { 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; return this.disabledText;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment