1
0
mirror of synced 2024-11-26 06:46:04 +03:00

catch up to master

This commit is contained in:
Igor Vaynberg 2012-05-07 08:27:14 -07:00
parent 6cc572650e
commit 5821ba2776
2 changed files with 11 additions and 2 deletions

View File

@ -764,7 +764,16 @@ $("#e14_destroy").click(function() { $("#e14").select2("destroy"); });
</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>
<table class="table table-bordered table-striped">
<tr><th>Parameter</th><th>Type</th><th>Description</th></tr>
<tr><td>object</td><td>object</td><td>A choice object</td></tr>
<tr><td>&lt;returns&gt;</td><td>string</td><td>the id of the object</td></tr>
</table>
The default implementation expects the object to have a <code>id</code> property that is returned.
</td></tr>
<tr><td>formatSelection</td><td>function</td><td>
Function used to render the current selection.
<pre>formatSelection(object)</pre>

@ -1 +1 @@
Subproject commit 011770a5d5572d6dd26dca2f01d6b2d0723f4733
Subproject commit a6edacc50563db0005cf06986a31a4a2fe322f4a