aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-01-26 23:16:02 -0800
committerJacob Thornton <[email protected]>2012-01-26 23:16:02 -0800
commitaa594501bd24d51181dc3504602aa4aaefb1cb60 (patch)
treee18731963c6017f7012dacc9822440a391fbb359 /docs
parentc63175dc1d41e2d26e50194a7e24cc0ea618446b (diff)
downloadbootstrap-aa594501bd24d51181dc3504602aa4aaefb1cb60.tar.xz
bootstrap-aa594501bd24d51181dc3504602aa4aaefb1cb60.zip
change typeahead to data-source instead of data-data and add to docs
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/css/bootstrap.css2
-rw-r--r--docs/javascript.html8
-rw-r--r--docs/templates/pages/javascript.mustache8
3 files changed, 15 insertions, 3 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 68e161051..28f49391b 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -6,7 +6,7 @@
* http://www.apache.org/licenses/LICENSE-2.0
*
* Designed and built with all the love in the world @twitter by @mdo and @fat.
- * Date: Thu Jan 26 22:39:03 PST 2012
+ * Date: Thu Jan 26 23:15:40 PST 2012
*/
article,
aside,
diff --git a/docs/javascript.html b/docs/javascript.html
index dd65c1b8d..894671b7e 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>
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 59b8a03d6..6e3ba25da 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -1258,7 +1258,7 @@ $('.myCarousel').carousel({
<h2>{{_i}}Example{{/i}}</h2>
<p>{{_i}}Start typing in the field below to show the typeahead results.{{/i}}</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>{{_i}}Using bootstrap-typeahead.js{{/i}}</h2>
@@ -1275,6 +1275,12 @@ $('.myCarousel').carousel({
</tr>
</thead>
<tbody>
+ <tr>
+ <td>{{_i}}source{{/i}}</td>
+ <td>{{_i}}array{{/i}}</td>
+ <td>[ ]</td>
+ <td>{{_i}}The data source to query against.{{/i}}</td>
+ </tr>
<tr>
<td>{{_i}}items{{/i}}</td>
<td>{{_i}}number{{/i}}</td>