diff options
| author | Matt Morgan <[email protected]> | 2012-06-03 00:33:06 -0400 |
|---|---|---|
| committer | Matt Morgan <[email protected]> | 2012-06-03 00:33:06 -0400 |
| commit | af14f6db5dddd15556b2c932e29ea1fc7a811594 (patch) | |
| tree | 8bb846859d4e4335cd52d5b6fc7eb154c2d9a643 /docs | |
| parent | 91a7274a43836484cdf27e34c45856e4b715f778 (diff) | |
| parent | bf9d8fcc070fa826c342282e102fe00e1af76d10 (diff) | |
| download | bootstrap-af14f6db5dddd15556b2c932e29ea1fc7a811594.tar.xz bootstrap-af14f6db5dddd15556b2c932e29ea1fc7a811594.zip | |
Merge branch 'async' into 2.1.0-wip
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/templates/pages/javascript.mustache | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 26ca9b538..7e0fdd858 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -1376,9 +1376,9 @@ $('.carousel').carousel({ <tbody> <tr> <td>{{_i}}source{{/i}}</td> - <td>{{_i}}array{{/i}}</td> + <td>{{_i}}array, function{{/i}}</td> <td>[ ]</td> - <td>{{_i}}The data source to query against.{{/i}}</td> + <td>{{_i}}The data source to query against. May be an array of strings or a function. The function is passed two arguments, the <code>query</code> value in the input field and the <code>process</code> callback. The function may be used synchronously by returning the data source directly or asynchronously via the <code>process</code> callback's single argument.{{/i}}</td> </tr> <tr> <td>{{_i}}items{{/i}}</td> @@ -1417,4 +1417,4 @@ $('.carousel').carousel({ <p>{{_i}}Initializes an input with a typeahead.{{/i}}</p> </div> </div> - </section>
\ No newline at end of file + </section> |