diff --git a/index.html b/index.html index 1509874c..96ca994c 100755 --- a/index.html +++ b/index.html @@ -1154,14 +1154,14 @@ $("#tags").select2({ they will be converted into an object that has an id and text attribute equal to the value of the string. - containerCssfunction/string - Inline css that will be added to select2's container + containerCssfunction/object + Inline css that will be added to select2's container. Either an object containing css property/value key pairs or a function that returns such an object. containerCssClassfunction/string Css class that will be added to select2's container tag - dropdownCssfunction/string - Inline css that will be added to select2's dropdown container + dropdownCssfunction/object + Inline css that will be added to select2's dropdown container. Either an object containing css property/value key pairs or a function that returns such an object. dropdownCssClassfunction/string Css class that will be added to select2's dropdown container diff --git a/select2-latest.html b/select2-latest.html index c66446c3..84f6f948 100755 --- a/select2-latest.html +++ b/select2-latest.html @@ -1186,14 +1186,14 @@ $("#tags").select2({ they will be converted into an object that has an id and text attribute equal to the value of the string. - containerCssfunction/string - Inline css that will be added to select2's container + containerCssfunction/object + Inline css that will be added to select2's container. Either an object containing css property/value key pairs or a function that returns such an object. containerCssClassfunction/string Css class that will be added to select2's container tag - dropdownCssfunction/string - Inline css that will be added to select2's dropdown container + dropdownCssfunction/object + Inline css that will be added to select2's dropdown container. Either an object containing css property/value key pairs or a function that returns such an object. dropdownCssClassfunction/string Css class that will be added to select2's dropdown container diff --git a/select2-master b/select2-master index d92a5726..220e50fd 160000 --- a/select2-master +++ b/select2-master @@ -1 +1 @@ -Subproject commit d92a5726944689198ca229c581560531b154ad52 +Subproject commit 220e50fd92102a02f40c5cf88dd022eb923bd414