github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-02-10 05:54:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip

Browse Source 
Conflicts:
	docs/assets/js/bootstrap.min.js
This commit is contained in:
Mark Otto
2012-06-02 22:14:12 -07:00
parent 9a3a297a47 2d3a0babd2
commit 9a4ee790e1
9 changed files with 79 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/templates/pages/javascript.mustache vendored
View File

@@ -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>
</section>