1
0
mirror of synced 2024-11-25 22:36:03 +03:00

catch up to master and updated docs

This commit is contained in:
Igor Vaynberg 2012-08-13 16:07:01 -07:00
parent c655a48843
commit e2cc72105d
3 changed files with 12 additions and 1 deletions

View File

@ -875,6 +875,7 @@ $("#e18,#e18_2").select2();
only
available when the placeholder is specified.
</p>
<p>This option only works when the placeholder is specified</p>
<p class="alert alert-warning">When attached to a <code>select</code> an <code>option</code> with an empty value must be provided.
This is the option that will be selected when the button is pressed since a select box requires
at least one selection <code>option</code>.</p>

View File

@ -922,6 +922,7 @@ $("#e18,#e18_2").select2();
only
available when the placeholder is specified.
</p>
<p>This option only works when the placeholder is specified</p>
<p class="alert alert-warning">When attached to a <code>select</code> an <code>option</code> with an empty value must be provided.
This is the option that will be selected when the button is pressed since a select box requires
at least one selection <code>option</code>.</p>
@ -957,6 +958,15 @@ $("#e18,#e18_2").select2();
</p>
</td>
</tr>
<tr>
<td>openOnEnter</td>
<td>boolean</td>
<td>
<p>
If set to true the dropdown is opened when the user presses the enter key and Select2 is closed. By default this option is enabled.
</p>
</td>
</tr>
<tr><td>id</td><td>function</td><td>
Function used to get the id from the choice object or a string representing the key under which the id is stored.
<pre>id(object)</pre>

@ -1 +1 @@
Subproject commit 289226cf6c925d7702336a5887a642750a016b58
Subproject commit 816af4425b5dd867dd8378a96c107759054e5e49