Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/twbs/bootstrap.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <chris.rebert@hulu.com>2013-06-26 06:32:17 +0400
committerChris Rebert <chris.rebert@hulu.com>2013-06-26 06:32:17 +0400
commit694c650f8e61a16fb18bf1c7c6c092e26ad52333 (patch)
tree62613d6de751d7ce14d43ce965c3fb2ba36ac9fb /docs/javascript.html
parentcc43ba35d7c1bb4663a8aea4eb0ba3a97d782852 (diff)
copyedit JS docs
Diffstat (limited to 'docs/javascript.html')
-rw-r--r--docs/javascript.html36
1 files changed, 18 insertions, 18 deletions
diff --git a/docs/javascript.html b/docs/javascript.html
index 9a5a5b6f06..d1c987904b 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -80,7 +80,7 @@ $('#myModal').on('show.bs.modal', function (e) {
<h1>Transitions <small>transition.js</small></h1>
</div>
<h3>About transitions</h3>
- <p>For simple transition effects, include transition.js once alongside the other JS files. If you're using the compiled (or minified) bootstrap.js, there is no need to include this&mdash;it's already there.</p>
+ <p>For simple transition effects, include <code>transition.js</code> once alongside the other JS files. If you're using the compiled (or minified) <code>bootstrap.js</code>, there is no need to include this&mdash;it's already there.</p>
<h3>Use cases</h3>
<p>A few examples of the transition plugin:</p>
<ul>
@@ -123,7 +123,7 @@ $('#myModal').on('show.bs.modal', function (e) {
<button type="button" class="btn btn-primary">Save changes</button>
</div>
</div><!-- /.modal-content -->
- </div><!-- /.modal-dalog -->
+ </div><!-- /.modal-dialog -->
</div><!-- /.modal -->
</div><!-- /example -->
{% highlight html %}
@@ -142,7 +142,7 @@ $('#myModal').on('show.bs.modal', function (e) {
<button type="button" class="btn btn-primary">Save changes</button>
</div>
</div><!-- /.modal-content -->
- </div><!-- /.modal-dalog -->
+ </div><!-- /.modal-dialog -->
</div><!-- /.modal -->
{% endhighlight %}
@@ -186,7 +186,7 @@ $('#myModal').on('show.bs.modal', function (e) {
</div>
</div><!-- /.modal-content -->
- </div><!-- /.modal-dalog -->
+ </div><!-- /.modal-dialog -->
</div><!-- /.modal -->
<div class="bs-example" style="padding-bottom: 24px;">
@@ -212,7 +212,7 @@ $('#myModal').on('show.bs.modal', function (e) {
<a href="#" class="btn btn-primary">Save changes</a>
</div>
</div><!-- /.modal-content -->
- </div><!-- /.modal-dalog -->
+ </div><!-- /.modal-dialog -->
</div><!-- /.modal -->
{% endhighlight %}
@@ -264,7 +264,7 @@ $('#myModal').on('show.bs.modal', function (e) {
<td>remote</td>
<td>path</td>
<td>false</td>
- <td><p>If a remote url is provided, content will be loaded via jQuery's <code>load</code> method and injected into the <code>.modal-body</code>. If you're using the data api, you may alternatively use the <code>href</code> tag to specify the remote source. An example of this is shown below:</p>
+ <td><p>If a remote URL is provided, content will be loaded via jQuery's <code>load</code> method and injected into the <code>.modal-body</code>. If you're using the data api, you may alternatively use the <code>href</code> tag to specify the remote source. An example of this is shown below:</p>
{% highlight html %}
<a data-toggle="modal" href="remote.html" data-target="#modal">Click me</a>
{% endhighlight %}
@@ -310,7 +310,7 @@ $('#myModal').modal({
</tr>
<tr>
<td>shown</td>
- <td>This event is fired when the modal has been made visible to the user (will wait for css transitions to complete).</td>
+ <td>This event is fired when the modal has been made visible to the user (will wait for CSS transitions to complete).</td>
</tr>
<tr>
<td>hide</td>
@@ -318,7 +318,7 @@ $('#myModal').modal({
</tr>
<tr>
<td>hidden</td>
- <td>This event is fired when the modal has finished being hidden from the user (will wait for css transitions to complete).</td>
+ <td>This event is fired when the modal has finished being hidden from the user (will wait for CSS transitions to complete).</td>
</tr>
</tbody>
</table>
@@ -773,13 +773,13 @@ $('#example').tooltip(options)
<td>animation</td>
<td>boolean</td>
<td>true</td>
- <td>apply a css fade transition to the tooltip</td>
+ <td>apply a CSS fade transition to the tooltip</td>
</tr>
<tr>
<td>html</td>
<td>boolean</td>
<td>false</td>
- <td>Insert html into the tooltip. If false, jquery's <code>text</code> method will be used to insert content into the dom. Use text if you're worried about XSS attacks.</td>
+ <td>Insert HTML into the tooltip. If false, jQuery's <code>text</code> method will be used to insert content into the DOM. Use text if you're worried about XSS attacks.</td>
</tr>
<tr>
<td>placement</td>
@@ -803,7 +803,7 @@ $('#example').tooltip(options)
<td>trigger</td>
<td>string</td>
<td>'hover focus'</td>
- <td>how tooltip is triggered - click | hover | focus | manual. Note you case pass trigger multiple, space seperated, trigger types.</td>
+ <td>how tooltip is triggered - click | hover | focus | manual. Note you case pass trigger multiple, space separated, trigger types.</td>
</tr>
<tr>
<td>delay</td>
@@ -820,7 +820,7 @@ $('#example').tooltip(options)
<td>string | false</td>
<td>false</td>
<td>
- <p>Appends the tooltip to a specific element <code>container: 'body'</code></p>
+ <p>Appends the tooltip to a specific element. Example: <code>container: 'body'</code></p>
</td>
</tr>
</tbody>
@@ -951,13 +951,13 @@ $('#example').tooltip(options)
<td>animation</td>
<td>boolean</td>
<td>true</td>
- <td>apply a css fade transition to the tooltip</td>
+ <td>apply a CSS fade transition to the tooltip</td>
</tr>
<tr>
<td>html</td>
<td>boolean</td>
<td>false</td>
- <td>Insert html into the popover. If false, jquery's <code>text</code> method will be used to insert content into the dom. Use text if you're worried about XSS attacks.</td>
+ <td>Insert HTML into the popover. If false, jQuery's <code>text</code> method will be used to insert content into the DOM. Use text if you're worried about XSS attacks.</td>
</tr>
<tr>
<td>placement</td>
@@ -1106,7 +1106,7 @@ $('#example').tooltip(options)
</tr>
<tr>
<td>closed</td>
- <td>This event is fired when the alert has been closed (will wait for css transitions to complete).</td>
+ <td>This event is fired when the alert has been closed (will wait for CSS transitions to complete).</td>
</tr>
</tbody>
</table>
@@ -1379,7 +1379,7 @@ $('.nav-tabs').button()
<h2>Usage</h2>
<h3>Via data attributes</h3>
- <p>Just add <code>data-toggle="collapse"</code> and a <code>data-target</code> to element to automatically assign control of a collapsible element. The <code>data-target</code> attribute accepts a css selector to apply the collapse to. Be sure to add the class <code>collapse</code> to the collapsible element. If you'd like it to default open, add the additional class <code>in</code>.</p>
+ <p>Just add <code>data-toggle="collapse"</code> and a <code>data-target</code> to element to automatically assign control of a collapsible element. The <code>data-target</code> attribute accepts a CSS selector to apply the collapse to. Be sure to add the class <code>collapse</code> to the collapsible element. If you'd like it to default open, add the additional class <code>in</code>.</p>
<p>To add accordion-like group management to a collapsible control, add the data attribute <code>data-parent="#selector"</code>. Refer to the demo to see this in action.</p>
<h3>Via JavaScript</h3>
@@ -1451,7 +1451,7 @@ $('#myCollapsible').collapse({
</tr>
<tr>
<td>shown</td>
- <td>This event is fired when a collapse element has been made visible to the user (will wait for css transitions to complete).</td>
+ <td>This event is fired when a collapse element has been made visible to the user (will wait for CSS transitions to complete).</td>
</tr>
<tr>
<td>hide</td>
@@ -1461,7 +1461,7 @@ $('#myCollapsible').collapse({
</tr>
<tr>
<td>hidden</td>
- <td>This event is fired when a collapse element has been hidden from the user (will wait for css transitions to complete).</td>
+ <td>This event is fired when a collapse element has been hidden from the user (will wait for CSS transitions to complete).</td>
</tr>
</tbody>
</table>