Merge pull request #715 from cwalv/patch-1

only use disabledText when multiselect is disabled

dist/js/bootstrap-multiselect.js

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