1
0
mirror of synced 2025-02-03 21:59:24 +03:00

catch up to master

This commit is contained in:
Igor Vaynberg 2013-06-22 08:00:50 -07:00
parent 8b24e9a09c
commit d2e13c1f91
3 changed files with 14 additions and 2 deletions

View File

@ -1678,7 +1678,7 @@ $("#select").select2({
</p>
<p>The event object contains the following custom properties:
<dl>
<dt>data</dt><dd>data that was used to populate the results</dd>
<dt>items</dt><dd>data that was used to populate the results</dd>
</dl>
</p>
</div>

@ -1 +1 @@
Subproject commit 455067ed4e60208eaf7195ad4f09d349bd20256e
Subproject commit 1415567a70fc0e95d4bfaf2ec8f66962ece36582

View File

@ -11,6 +11,18 @@
<!-- <div style="height:200px;"></div> -->
<div style="padding: 10px; margin: 10px;">
<br/><br/><br/>
<input type="text" value="tab!" autofocus>
<input type="text" id="input">
<input type="text" value="ooops! skipped selector">
<script>
$("#input").select2({data:[]});
$("#input").select2({data:[]});
</script>
<br/>
<input type="text" size="30"/><br/>
<label for="e4">Label: </label>
<div style="white-space: nowrap">