Skip to content

B
bootstrap-multiselect
Commit 8ebd318a authored by David Stutz's avatar David Stutz
Browse files
Options

Merge branch 'master' of https://github.com/davidstutz/bootstrap-multiselect

parents 2b9a5fdb 31e1ea69
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
dist/js/bootstrap-multiselect.js
View file @ 8ebd318a
...@@ -234,9 +234,8 @@ ...@@ -234,9 +234,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