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

…iselect
davidstutz · Jul 14, 2014 · a6a7645 · a6a7645
2 parents d887a6b + bdd8a42
commit a6a7645
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 2 deletions.
diff --git a/css/bootstrap-multiselect.css b/css/bootstrap-multiselect.css
diff --git a/js/bootstrap-multiselect.js b/js/bootstrap-multiselect.js
@@ -30,6 +30,8 @@
                 $(element).multiselect(config);
 
                 if (isObservableArray(listOfSelectedItems)) {
+                   //set the initial selection state on the multi-select list
+                    $(element).multiselect('select', ko.utils.unwrapObservable(listOfSelectedItems));
                     // Subscribe to the selectedOptions: ko.observableArray
                     listOfSelectedItems.subscribe(function (changes) {
                         var addedArray = [], deletedArray = [];
@@ -262,6 +264,9 @@
                 this.$button.css({
                     'width' : this.options.buttonWidth
                 });
+                this.$container.css({
+                    'width': this.options.buttonWidth
+                });
             }
 
             // Keep the tab index from the select.
@@ -894,7 +899,7 @@
             var optionDOM = "";
             var groupCounter = 0;
 
-            $.each(dataprovider, function (option) {
+            $.each(dataprovider, function (index, option) {
                 if ($.isArray(option.children)) {
                     groupCounter++;
                     optionDOM += '<optgroup label="' + (option.title || 'Group ' + groupCounter) + '">';

diff --git a/less/bootstrap-multiselect.less b/less/bootstrap-multiselect.less
@@ -58,3 +58,17 @@
   border-bottom-left-radius: 4px;
 }
 
+.form-inline .multiselect-container{
+
+  label.checkbox, label.radio{
+    padding: 3px 20px 3px 40px;
+  }
+
+  li a label{              
+
+    &.checkbox input[type="checkbox"], &.radio input[type="radio"]{
+      margin-left: -20px;
+      margin-right: 0;
+    }
+  }
+}