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-02-14 19:53:15 -08:00
parent c31e6791bb
commit 4d2990af7f
2 changed files with 11 additions and 1 deletions

View File

@ -186,6 +186,11 @@ $("#e10_3").select2({
formatSelection: format,
formatResult: format
});
$("#e10_4").select2({
data:function() { return { results: data }; },
formatSelection: format,
formatResult: format
});
});
</script>
@ -521,6 +526,11 @@ $("#e19").select2({ maximumSelectionSize: 3 });
<p>
<input type="hidden" id="e10_3" style="width:300px"/>
</p>
<p><code>data</code> can also itself be a function that returns a results object:</p>
<p>
<input type="hidden" id="e10_4" style="width:300px"/>
</p>
</div>
<div class="span8">
<h3>Example Code</h3>

@ -1 +1 @@
Subproject commit 76cd1453800aee9f6188355e21d2c2c0bb71c544
Subproject commit 7d908da52fab3af0d0341b4fc454aa0c4db80b72