1
0
mirror of synced 2024-11-22 21:16:10 +03:00

catch up to master

This commit is contained in:
Igor Vaynberg 2012-04-24 10:46:44 -07:00
parent 4851682ea3
commit 910568983c
2 changed files with 15 additions and 2 deletions

View File

@ -123,7 +123,7 @@ $("#e5").select2({
$(document).ready(function() { $(document).ready(function() {
$("#e6").select2({ $("#e6").select2({
placeholder: {title: "Search for a movie", id: ""}, placeholder: {title: "Search for a movie", id: ""},
minimumInputLength: 3, minimumInputLength: 1,
ajax: { // instead of writing the function to execute the request we use Select2's convenient helper ajax: { // instead of writing the function to execute the request we use Select2's convenient helper
url: "http://api.rottentomatoes.com/api/public/v1.0/movies.json", url: "http://api.rottentomatoes.com/api/public/v1.0/movies.json",
dataType: 'jsonp', dataType: 'jsonp',
@ -747,6 +747,19 @@ $("#e14_destroy").click(function() { $("#e14").select2("destroy"); });
</p> </p>
</td> </td>
</tr> </tr>
<tr>
<td>closeOnSelect</td>
<td>boolean</td>
<td>
<p>
If set to true the dropdown is not closed after a selection is made, allowing for rapid selection of multiple items. By default this option is disabled.
</p>
<p class="alert alert-info">
Only applies when configured in multi-select mode.
</p>
</td>
</tr>
<tr><td>formatSelection</td><td>function</td><td> <tr><td>formatSelection</td><td>function</td><td>
Function used to render the current selection. Function used to render the current selection.

@ -1 +1 @@
Subproject commit 5ccee14cee027102beabc3e578509512b0fb8fd7 Subproject commit 293bd830b29f0e9eaded8db25fecaa8bfaa72a9a