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

davidstutz · davidstutz · commit e90ae15c34f8 · 2015-03-17T20:40:56.000-04:00
diff --git a/dist/js/bootstrap-multiselect.js b/dist/js/bootstrap-multiselect.js
@@ -1144,6 +1144,9 @@
             if (this.options.disableIfEmpty && $('option', this.$select).length <= 0) {
                 this.disable();
             }
+            else {
+                this.enable();
+            }
             
             if (this.options.dropRight) {
                 this.$ul.addClass('pull-right');

Original file line number	Diff line number	Diff line change
`@@ -1144,6 +1144,9 @@`
`1144`	`1144`	`if (this.options.disableIfEmpty && $('option', this.$select).length <= 0) {`
`1145`	`1145`	`this.disable();`
`1146`	`1146`	`}`
	`1147`	`+ else {`
	`1148`	`+ this.enable();`
	`1149`	`+ }`
`1147`	`1150`
`1148`	`1151`	`if (this.options.dropRight) {`
`1149`	`1152`	`this.$ul.addClass('pull-right');`