github/bootstrap
1
1
Fork 0
mirror of https://github.com/jasny/bootstrap.git synced 2026-01-21 04:17:53 -05:00
Code Issues Packages Projects Releases Wiki Activity

Improved docs for v2.2.2-j3

Browse Source
This commit is contained in:
Arnold Daniels
2012-12-28 22:56:15 +01:00
parent db6a8e2d20
commit 9565f1703a
5 changed files with 53 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/assets/js/bootstrap.js vendored
View File

@@ -2682,7 +2682,7 @@
"use strict"; // jshint ;_
/* INPUTMASK PUBLIC CLASS DEFINITION
/* FILEUPLOAD PUBLIC CLASS DEFINITION
* ================================= */
var Fileupload = function (element, options) {
@@ -2796,7 +2796,7 @@
}
/* INPUTMASK PLUGIN DEFINITION
/* FILEUPLOAD PLUGIN DEFINITION
* =========================== */
$.fn.fileupload = function (options) {
@@ -2811,7 +2811,7 @@
$.fn.fileupload.Constructor = Fileupload
/* INPUTMASK DATA-API
/* FILEUPLOAD DATA-API
* ================== */
$(function () {

22
docs/index.html
View File

@@ -139,9 +139,9 @@
<p class="marketing-byline">How can a fantastic library become any better? Check it out.</p>
<div class="row">
<div class="span3">
<h3><a href="./base-css.html#action-links">Action links</a></h3>
<p>Sometimes a button will pull to much attention to an action. In those cases, you can use action links instead.</p>
<p>Action links look distinctly different than normal links.</p>
<h3><a href="./javascript.html#typeahead">Typeahead</a></h3>
<p>With the improved typeahead, it's easy to fetch the data using AJAX.</p>
<p>It support key/value pairs (objects) next to normal arrays. Also you can convert a <code>&lt;select&gt;</code> to a typeahead.</p>
</div>
<div class="span3">
<h3><a href="./javascript.html#inputmask">Input mask</a></h3>
@@ -179,6 +179,11 @@
</div>
</div>
<div class="row">
<div class="span3">
<h3><a href="./base-css.html#action-links">Action links</a></h3>
<p>Sometimes a button will pull to much attention to an action. In those cases, you can use action links instead.</p>
<p>Action links look distinctly different than normal links.</p>
</div>
<div class="span3">
<h3><a href="./base-css.html#forms">Form elements</a></h3>
<p>Go beyond uneditable input and create a full uneditable form, with disabled and uneditable elements.</p>
@@ -193,6 +198,17 @@
<h3><a href="./components.html#navs">Tabbable</a></h3>
<p>Tabs work better than ever. You now have a bordered tabbable available. Also, a container can be turned into a tabbable.</p>
</div>
</div>
<div class="row">
<div class="span3">
<h3><a href="./customize.html">Customize</a></h3>
<p>Each customized bootstrap.zip contains a `custom.json` file, which can be used to use the same packages and variables when upgrading.</p>
<p>Automatically includes the CSS for jQuery plugins.</p>
</div>
<div class="span3">
<h3><a href="./javascript.html">Download js plugins</a></h3>
<p>Download a jQuery plugin directly from the javascript docs, including required CSS.</p>
</div>
<div class="span3">
<h3>More</h3>
<ul>

8
docs/javascript.html
View File

@@ -1760,7 +1760,11 @@ $('.carousel').carousel({
<td>source</td>
<td>array, object, string, function</td>
<td>[ ]</td>
<td>The data source to query against. May be an array of strings, an object as key/value pairs, a url (string) 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.</td>
<td>
<p>The data source to query against. May be an array of strings, an object as key/value pairs, a url (string) to get the data using AJAX or a function.</p>
<p>When using AJAX, the server should output a valid JSON array or key/value pair object.</p>
<p>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.</p>
</td>
</tr>
<tr>
<td>items</td>
@@ -1812,7 +1816,7 @@ $('.carousel').carousel({
<p>Initializes an input with a typeahead.</p>
<h3>Result</h3>
<p>If the source are key/value pairs, the <code>data-value</code> attribute will contain the key.</p>
<p>If the source is an object with key/value pairs, the <code>data-value</code> attribute will contain the key.</p>
</section>

22
docs/templates/pages/index.mustache vendored
View File

@@ -58,9 +58,9 @@
<p class="marketing-byline">{{_i}}How can a fantastic library become any better? Check it out.{{/i}}</p>
<div class="row">
<div class="span3">
<h3><a href="./base-css.html#action-links">{{_i}}Action links{{/i}}</a></h3>
<p>{{_i}}Sometimes a button will pull to much attention to an action. In those cases, you can use action links instead.{{/i}}</p>
<p>{{_i}}Action links look distinctly different than normal links.{{/i}}</p>
<h3><a href="./javascript.html#typeahead">{{_i}}Typeahead{{/i}}</a></h3>
<p>{{_i}}With the improved typeahead, it's easy to fetch the data using AJAX.{{/i}}</p>
<p>{{_i}}It support key/value pairs (objects) next to normal arrays. Also you can convert a <code>&lt;select&gt;</code> to a typeahead.{{/i}}</p>
</div>
<div class="span3">
<h3><a href="./javascript.html#inputmask">{{_i}}Input mask{{/i}}</a></h3>
@@ -98,6 +98,11 @@
</div>
</div>
<div class="row">
<div class="span3">
<h3><a href="./base-css.html#action-links">{{_i}}Action links{{/i}}</a></h3>
<p>{{_i}}Sometimes a button will pull to much attention to an action. In those cases, you can use action links instead.{{/i}}</p>
<p>{{_i}}Action links look distinctly different than normal links.{{/i}}</p>
</div>
<div class="span3">
<h3><a href="./base-css.html#forms">{{_i}}Form elements{{/i}}</a></h3>
<p>{{_i}}Go beyond uneditable input and create a full uneditable form, with disabled and uneditable elements.{{/i}}</p>
@@ -112,6 +117,17 @@
<h3><a href="./components.html#navs">{{_i}}Tabbable{{/i}}</a></h3>
<p>{{_i}}Tabs work better than ever. You now have a bordered tabbable available. Also, a container can be turned into a tabbable.{{/i}}</p>
</div>
</div>
<div class="row">
<div class="span3">
<h3><a href="./customize.html">{{_i}}Customize{{/i}}</a></h3>
<p>{{_i}}Each customized bootstrap.zip contains a `custom.json` file, which can be used to use the same packages and variables when upgrading.{{/i}}</p>
<p>{{_i}}Automatically includes the CSS for jQuery plugins.{{/i}}</p>
</div>
<div class="span3">
<h3><a href="./javascript.html">{{_i}}Download js plugins{{/i}}</a></h3>
<p>{{_i}}Download a jQuery plugin directly from the javascript docs, including required CSS.{{/i}}</p>
</div>
<div class="span3">
<h3>{{_i}}More{{/i}}</h3>
<ul>

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

@@ -1680,7 +1680,11 @@ $('.carousel').carousel({
<td>{{_i}}source{{/i}}</td>
<td>{{_i}}array, object, string, function{{/i}}</td>
<td>[ ]</td>
<td>{{_i}}The data source to query against. May be an array of strings, an object as key/value pairs, a url (string) 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>
<td>
<p>{{_i}}The data source to query against. May be an array of strings, an object as key/value pairs, a url (string) to get the data using AJAX or a function.{{/i}}</p>
<p>{{_i}}When using AJAX, the server should output a valid JSON array or key/value pair object.{{/i}}</p>
<p>{{_i}}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}}</p>
</td>
</tr>
<tr>
<td>{{_i}}items{{/i}}</td>
@@ -1732,7 +1736,7 @@ $('.carousel').carousel({
<p>{{_i}}Initializes an input with a typeahead.{{/i}}</p>
<h3>{{_i}}Result{{/i}}</h3>
<p>{{_i}}If the source are key/value pairs, the <code>data-value</code> attribute will contain the key.{{/i}}</p>
<p>{{_i}}If the source is an object with key/value pairs, the <code>data-value</code> attribute will contain the key.{{/i}}</p>
</section>