diff options
| author | Mark Otto <[email protected]> | 2012-01-27 13:21:01 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-27 13:21:01 -0800 |
| commit | ccd963e622bdcadc8a79f5b8c1bb770b09f63f20 (patch) | |
| tree | 64c97dbd98648791b2eb04682e25dcc6610f5aa4 /docs/javascript.html | |
| parent | e8647c1b118d2c726a8987e9a41aad82da972b57 (diff) | |
| parent | 3b3dbd7229f53eb71759def4eca90dfd7a2699f8 (diff) | |
| download | bootstrap-ccd963e622bdcadc8a79f5b8c1bb770b09f63f20.tar.xz bootstrap-ccd963e622bdcadc8a79f5b8c1bb770b09f63f20.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
docs/assets/css/bootstrap.css
docs/download.html
Diffstat (limited to 'docs/javascript.html')
| -rw-r--r-- | docs/javascript.html | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index 3a869e930..cf9a1742d 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -1323,7 +1323,7 @@ $('.myCarousel').carousel({ <h2>Example</h2> <p>Start typing in the field below to show the typeahead results.</p> <div class="well"> - <input type="text" class="span3" style="margin: 0 auto;" data-provide="typeahead" data-items="4" data-data='["Alabama","Alaska","Arizona","Arkansas","California","Colorado","Connecticut","Delaware","Florida","Georgia","Hawaii","Idaho","Illinois","Indiana","Iowa","Kansas","Kentucky","Louisiana","Maine","Maryland","Massachusetts","Michigan","Minnesota","Mississippi","Missouri","Montana","Nebraska","Nevada","New Hampshire","New Jersey","New Mexico","New York","North Dakota","North Carolina","Ohio","Oklahoma","Oregon","Pennsylvania","Rhode Island","South Carolina","South Dakota","Tennessee","Texas","Utah","Vermont","Virginia","Washington","West Virginia","Wisconsin","Wyoming"]'> + <input type="text" class="span3" style="margin: 0 auto;" data-provide="typeahead" data-items="4" data-source='["Alabama","Alaska","Arizona","Arkansas","California","Colorado","Connecticut","Delaware","Florida","Georgia","Hawaii","Idaho","Illinois","Indiana","Iowa","Kansas","Kentucky","Louisiana","Maine","Maryland","Massachusetts","Michigan","Minnesota","Mississippi","Missouri","Montana","Nebraska","Nevada","New Hampshire","New Jersey","New Mexico","New York","North Dakota","North Carolina","Ohio","Oklahoma","Oregon","Pennsylvania","Rhode Island","South Carolina","South Dakota","Tennessee","Texas","Utah","Vermont","Virginia","Washington","West Virginia","Wisconsin","Wyoming"]'> </div> <hr> <h2>Using bootstrap-typeahead.js</h2> @@ -1340,6 +1340,12 @@ $('.myCarousel').carousel({ </tr> </thead> <tbody> + <tr> + <td>source</td> + <td>array</td> + <td>[ ]</td> + <td>The data source to query against.</td> + </tr> <tr> <td>items</td> <td>number</td> |