1
0
mirror of synced 2024-11-29 08:06:03 +03:00

catch up to master

This commit is contained in:
Igor Vaynberg 2013-01-08 10:48:33 -08:00
parent d96d0dceff
commit 9e9afba9a3
2 changed files with 2 additions and 2 deletions

View File

@ -1319,7 +1319,7 @@ $("#tags").select2({
<tr><th>Parameter</th><th>Type</th><th>Description</th></tr>
<tr><td>transport</td><td>function</td><td>Function that will be used to perform the ajax request. Must be parameter-compatible with <code>$.ajax</code>. Defaults to <code>$.ajax</code> if not specified.
Allows the use of various ajax wrapper libraries such as: <a href="http://www.protofunc.com/scripts/jquery/ajaxManager/">AjaxManager</a>. </td></tr>
<tr><td>url</td><td>string</td><td>Ajax url</td></tr>
<tr><td>url</td><td>string/function</td><td>String containing the ajax url or a function that returns such a string.</td></tr>
<tr><td>dataType</td><td>string</td><td>Data type for the request. <code>ajax</code>, <code>jsonp</code>, other formats supported by jquery</td></tr>
<tr><td>quietMillis</td><td>int</td><td>Number of milliseconds to wait for the user to stop typing before issuing the ajax request</td></tr>
<tr><td>data</td><td>function</td><td>

@ -1 +1 @@
Subproject commit b4f6462bb29d485bc158580b62e84812267165c5
Subproject commit b562d1a0e55678117be6248adc84823280dfb6be