aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorJacob Thornton <[email protected]>2012-01-28 13:16:05 -0800
committerJacob Thornton <[email protected]>2012-01-28 13:16:05 -0800
commit6935f693b3bce10f9bfe7b7e1f3c2705ff2b6ca2 (patch)
tree29cb6f5e9fed5aaf1f65cdfa94a77faa2a5b44df /docs
parentf768242759903151c9957a493c5349f931d882ef (diff)
downloadbootstrap-6935f693b3bce10f9bfe7b7e1f3c2705ff2b6ca2.tar.xz
bootstrap-6935f693b3bce10f9bfe7b7e1f3c2705ff2b6ca2.zip
typahead does case insensitive matching with simple sorter + accepts highlighter option
Diffstat (limited to 'docs')
-rw-r--r--docs/assets/css/bootstrap.css2
-rw-r--r--docs/javascript.html12
-rw-r--r--docs/templates/pages/javascript.mustache12
3 files changed, 19 insertions, 7 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index 2fddd8f41..cc58533a0 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -1983,7 +1983,7 @@ table .span12 {
.navbar-search .search-query :-moz-placeholder {
color: #eeeeee;
}
-.navbar-search .search-query ::-webkit-input-placeholder {
+.navbar-search .search-query::-webkit-input-placeholder {
color: #eeeeee;
}
.navbar-search .search-query:hover {
diff --git a/docs/javascript.html b/docs/javascript.html
index f1ce98658..a35b44dd3 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1362,7 +1362,7 @@ $('.myCarousel').carousel({
<tr>
<th style="width: 100px;">Name</th>
<th style="width: 50px;">type</th>
- <th style="width: 90px;">default</th>
+ <th style="width: 100px;">default</th>
<th>description</th>
</tr>
</thead>
@@ -1382,15 +1382,21 @@ $('.myCarousel').carousel({
<tr>
<td>matcher</td>
<td>function</td>
- <td>case sensitive</td>
+ <td>case insensitive</td>
<td>The method used to determine if a query matches an item. Accepts a single argument, the <code>item</code> against which to test the query. Access the current query with <code>this.query</code>. Return a boolean <code>true</code> if query is a match.</td>
</tr>
<tr>
<td>sorter</td>
<td>function</td>
- <td>no sort</td>
+ <td>exact match,<br> case sensitive,<br> case insensitive</td>
<td>Method used to sort autocomplete results. Accepts a single argument <code>items</code> and has the scope of the typeahead instance. Reference the current query with <code>this.query</code>.</td>
</tr>
+ <tr>
+ <td>highlighter</td>
+ <td>function</td>
+ <td>highlights all default matches</td>
+ <td>Method used to highlight autocomplete results. Accepts a single argument <code>item</code> and has the scope of the typeahead instance. Should return html.</td>
+ </tr>
</tbody>
</table>
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 46420660a..cba75ac08 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -1297,7 +1297,7 @@ $('.myCarousel').carousel({
<tr>
<th style="width: 100px;">{{_i}}Name{{/i}}</th>
<th style="width: 50px;">{{_i}}type{{/i}}</th>
- <th style="width: 90px;">{{_i}}default{{/i}}</th>
+ <th style="width: 100px;">{{_i}}default{{/i}}</th>
<th>{{_i}}description{{/i}}</th>
</tr>
</thead>
@@ -1317,15 +1317,21 @@ $('.myCarousel').carousel({
<tr>
<td>{{_i}}matcher{{/i}}</td>
<td>{{_i}}function{{/i}}</td>
- <td>case sensitive</td>
+ <td>{{_i}}case insensitive{{/i}}</td>
<td>{{_i}}The method used to determine if a query matches an item. Accepts a single argument, the <code>item</code> against which to test the query. Access the current query with <code>this.query</code>. Return a boolean <code>true</code> if query is a match.{{/i}}</td>
</tr>
<tr>
<td>{{_i}}sorter{{/i}}</td>
<td>{{_i}}function{{/i}}</td>
- <td>no sort</td>
+ <td>{{_i}}exact match,<br> case sensitive,<br> case insensitive{{/i}}</td>
<td>{{_i}}Method used to sort autocomplete results. Accepts a single argument <code>items</code> and has the scope of the typeahead instance. Reference the current query with <code>this.query</code>.{{/i}}</td>
</tr>
+ <tr>
+ <td>{{_i}}highlighter{{/i}}</td>
+ <td>{{_i}}function{{/i}}</td>
+ <td>{{_i}}highlights all default matches{{/i}}</td>
+ <td>{{_i}}Method used to highlight autocomplete results. Accepts a single argument <code>item</code> and has the scope of the typeahead instance. Should return html.{{/i}}</td>
+ </tr>
</tbody>
</table>