1
0
mirror of synced 2025-03-11 15:16:09 +03:00

catch up to master

This commit is contained in:
Igor Vaynberg 2012-07-18 09:56:17 +03:00
parent c4e681f675
commit 84ac3c2929
2 changed files with 5 additions and 4 deletions

View File

@ -1184,16 +1184,17 @@ $("#tags").select2({
</tr>
</table>
</td></tr>
</table>
Example: <pre class="prettyprint">alert("Selected value is: "+$("#e8").select2("val")); $("#e8").select2("val", {id:"CA", text:"Califoria"});</pre>
<p><code>val</code> method invoked on a single-select with an unset value will return <code>""</code>, while a <code>val</code> method invoked on an empty multi-select will return <code>[]</code></p>
Example: <pre class="prettyprint">alert("Selected value is: "+$("#e8").select2("val")); $("#e8").select2("val", {id:"CA", text:"Califoria"});</pre>
<div class="row">
<div class="span12"><h3>data</h3></div>
</div>
<p>Gets or sets the selection. Analogous to <code>val</code> method, but works with objects instead of ids.</p>
<p><code>data</code> method invoked on a single-select with an unset value will return <code>null</code>, while a <code>data</code> method invoked on an empty multi-select will return <code>[]</code></p>
<div class="row">

@ -1 +1 @@
Subproject commit 3a830a2b81755bd0ba754defa4899cf164f13fc7
Subproject commit ad9fac45aee04b3b91b186a539ceedb784ab242b