catch up to master
This commit is contained in:
parent
96bc6ab38c
commit
b903c04a70
@ -499,7 +499,7 @@ $("#e10_3").select2({
|
||||
</p>
|
||||
<h3>Example Code</h3>
|
||||
<pre class="prettyprint linenums" id="code_e6"></pre>
|
||||
<p>Select2 uses jQuery's <code>$.ajax</code> function to execute the remote call. If you would like to use another transport you can specify your own <code>query</code> function instead of using the <code>ajax</code> helper.</p>
|
||||
<p>Select2 uses jQuery's <code>$.ajax</code> function to execute the remote call by default. An alternative <code>transport</code> function can be specified in the ajax settings, or an entirely custom implementation can be built by providing a custom <code>query</code> function instead of using the <code>ajax</code> helper</p>
|
||||
</div>
|
||||
</article>
|
||||
<article class="row" id="infinite">
|
||||
@ -828,6 +828,8 @@ $("#tags").select2({
|
||||
|
||||
<table class="table table-bordered table-striped">
|
||||
<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>dataType</td><td>stringt</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>
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit 54033cdb0422ef7cc5c35ff5e94e3034a0539df5
|
||||
Subproject commit c8b274e9abec3ed825c91b517c3124bb62a31fad
|
Loading…
Reference in New Issue
Block a user