From 1ef5fa7d6b4e50230c0c12919b0a06a9a2ac07f1 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Tue, 20 Dec 2011 18:02:47 -0800
Subject: giant refactor - all spec passing again...

---
 docs/javascript.html | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index 4e4004132..964d2f7aa 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -25,7 +25,8 @@
 
     <!-- Le javascript -->
     <!-- placed up here so that the inline demos can be next to their markup -->
-    <script src="http://code.jquery.com/jquery-1.7.min.js"></script>
+    <!-- <script src="http://code.jquery.com/jquery-1.7.min.js"></script> -->
+    <script src="../js/tests/vendor/jquery.js"></script>
 
     <script type="text/javascript">
       // NOT FINAL BY ANY MEANS, JUST MAH JANK CODE BRO
@@ -52,15 +53,13 @@
     <script>
       $(function () {
         // twipsy demo
-        $("a[rel=twipsy]").twipsy({
-          live: true
+        $('.twipsy-demo.well').twipsy({
+          selector: "a[rel=twipsy]"
         })
 
         //popover demo
         $("a[rel=popover]")
-          .popover({
-            offset: 10
-          })
+          .popover()
           .click(function(e) {
             e.preventDefault()
           })
@@ -94,7 +93,7 @@
       ================================================== -->
       <header class="jumbotron subhead" id="overview">
         <h1>Javascript for Bootstrap</h1>
-        <p class="lead">Bring Bootstrap's components to life with flexible, custom javascript plugins for many of our custom components that work with <a href="http://jquery.com/" target="_blank">jQuery</a> and <a href="http://ender.no.de" target="_blank">Ender</a>.</p>
+        <p class="lead">Bring Bootstrap's components to life with 12 custom, flexible <a href="http://jquery.com/" target="_blank">jQuery</a> plugins.
       </header>
 
 
@@ -112,7 +111,7 @@
      </div>
      <div class="span9">
       <h3>What's included</h3>
-       <p>Bring some of Bootstrap's primary components to life with new custom plugins that work with <a href="http://jquery.com/" target="_blank">jQuery</a> and <a href="http://ender.no.de" target="_blank">Ender</a>. We encourage you to extend and modify them to fit your specific development needs.</p>
+       <p>Bring some of Bootstrap's primary components to life with custom <a href="http://jquery.com/" target="_blank">jQuery</a> plugins. We encourage you to extend and modify them to fit your specific development needs.</p>
        <table class="striped-table">
          <thead>
            <tr>
@@ -138,7 +137,7 @@
              <td>The ScrollSpy plugin is for adding an auto updating nav based on scroll position to the bootstrap navbar.</td>
            </tr>
            <tr>
-             <td><a href="./javascript.html#tabs">bootstrap-tab.js</a></td>
+             <td><a href="./javascript.html#tab">bootstrap-tab.js</a></td>
              <td>This plugin adds quick, dynamic tab and pill functionality for cycling through local content.</td>
            </tr>
            <tr>
@@ -444,9 +443,9 @@ $('#myModal').bind('hidden', function () {
     <!-- Tabs
     ================================================== -->
 
-    <section id="tabs">
+    <section id="tab">
       <div class="page-header">
-        <h1>Tabs <small>bootstrap-tab.js</small></h1>
+        <h1>Tab <small>bootstrap-tab.js</small></h1>
       </div>
       <div class="row">
         <div class="span3 columns">
@@ -467,7 +466,7 @@ $('#myModal').bind('hidden', function () {
           <h3>Methods</h3>
           <h4>$().tab</h4>
           <p>
-            Activates tab functionality for a given element controller. Tab should have either a `data-target` or an `href` referencing a node in the dom.
+            Activates a tab element and content container. Tab should have either a `data-target` or an `href` targeting a container node in the dom.
           </p>
 <pre class="prettyprint linenums">
 &lt;ul class="tabs"&gt;
@@ -504,7 +503,7 @@ $('#myModal').bind('hidden', function () {
                <td>This event fires on tab show, but before the new tab has been shown. Use <code>event.target</code> and <code>event.relatedTarget</code> to target the active tab and the previous active tab (if available) respectively.</td>
             </tr>
             <tr>
-               <td>show</td>
+               <td>shown</td>
                <td>This event fires on tab show after a tab has been shown. Use <code>event.target</code> and <code>event.relatedTarget</code> to target the active tab and the previous active tab (if available) respectively.</td>
              </tr>
             </tbody>
@@ -634,8 +633,8 @@ $('a[data-toggle="tab"]').bind('shown', function (e) {
           <p>Hides an elements twipsy.</p>
           <pre class="prettyprint linenums">$('#element').twipsy('hide')</pre>
           <h3>Demo</h3>
-          <div class="well">
-            <p class="muted">Tight pants next level keffiyeh <a href="#" rel='twipsy' title='Some title text'>you probably</a> haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel <a href="#" rel='twipsy' title='Another twipsy'>have a</a> terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A <a href="#" rel='twipsy' title='Another one here too'>really ironic</a> artisan whatever keytar, scenester farm-to-table banksy Austin <a href="#" rel='twipsy' title='The last tip!'>twitter handle</a> freegan cred raw denim single-origin coffee viral.
+          <div class="twipsy-demo well">
+            <p class="muted">Tight pants next level keffiyeh <a href="#" rel='twipsy' title="first twipsy">you probably</a> haven't heard of them. Photo booth beard raw denim letterpress vegan messenger bag stumptown. Farm-to-table seitan, mcsweeney's fixie sustainable quinoa 8-bit american apparel <a href="#" rel='twipsy' title='Another twipsy'>have a</a> terry richardson vinyl chambray. Beard stumptown, cardigans banh mi lomo thundercats. Tofu biodiesel williamsburg marfa, four loko mcsweeney's cleanse vegan chambray. A <a href="#" rel='twipsy' title='Another one here too'>really ironic</a> artisan whatever keytar, scenester farm-to-table banksy Austin <a href="#" rel='twipsy' title='The last tip!'>twitter handle</a> freegan cred raw denim single-origin coffee viral.
             </p>
           </div>
         </div>
-- 
cgit v1.2.3


From 0980a33b4703677e1aaf3cd949c0437512fa6f33 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Tue, 20 Dec 2011 19:37:41 -0800
Subject: update all to new on api + add animation support to tabs

---
 docs/javascript.html | 112 +++++++++++++++++++++++++++++----------------------
 1 file changed, 63 insertions(+), 49 deletions(-)

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index 964d2f7aa..45a7a2fe8 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -93,7 +93,7 @@
       ================================================== -->
       <header class="jumbotron subhead" id="overview">
         <h1>Javascript for Bootstrap</h1>
-        <p class="lead">Bring Bootstrap's components to life with 12 custom, flexible <a href="http://jquery.com/" target="_blank">jQuery</a> plugins.
+        <p class="lead">Bring Bootstrap's components to life &mdash; now with 12 custom <a href="http://jquery.com/" target="_blank">jQuery</a> plugins.
       </header>
 
 
@@ -121,36 +121,40 @@
          </thead>
          <tbody>
            <tr>
-             <td><a href="./javascript.html#modal">bootstrap-modal.js</a></td>
-             <td>Our Modal plugin is a <strong>super</strong> slim take on the traditional modal js plugin! We took special care to include only the bare functionality that we require at twitter.</td>
+             <td><a href="./javascript.html#transition">bootstrap-transition.js</a></td>
+             <td>The transition plugin is required for adding animation to other bootstrap plugins. Include this plugin (only once) when sliding in modals or fading out alerts.</td>
            </tr>
            <tr>
-             <td><a href="./javascript.html#alert">bootstrap-alert.js</a></td>
-             <td>The alert plugin is a super tiny class for adding close functionality to alerts.</td>
+             <td><a href="./javascript.html#modal">bootstrap-modal.js</a></td>
+             <td>Our Modal plugin is a super slim take on the traditional modal js plugin! We took special care to include only the bare functionality that we require here at twitter.</td>
            </tr>
            <tr>
              <td><a href="./javascript.html#dropdown">bootstrap-dropdown.js</a></td>
-             <td>This plugin is for adding dropdown interaction to the bootstrap navbar or tabbed navigations.</td>
+             <td>This plugin is for adding generic dropdown interactions to things like navigation top bars and tabs.</td>
            </tr>
            <tr>
              <td><a href="./javascript.html#scrollspy">bootstrap-scrollspy.js</a></td>
-             <td>The ScrollSpy plugin is for adding an auto updating nav based on scroll position to the bootstrap navbar.</td>
+             <td>The ScrollSpy plugin is for automatically updating nav targets based on scroll position.</td>
            </tr>
            <tr>
              <td><a href="./javascript.html#tab">bootstrap-tab.js</a></td>
-             <td>This plugin adds quick, dynamic tab and pill functionality for cycling through local content.</td>
-           </tr>
+             <td>This plugin adds quick, dynamic tab and pill functionality for transitioning through local content.</td>
            <tr>
              <td><a href="./javascript.html#twipsy">bootstrap-twipsy.js</a></td>
-             <td>Based on the excellent jQuery.tipsy plugin written by Jason Frame; twipsy is an updated version, which doesn't rely on images, uses css3 for animations, and data-attributes for local title storage!</td>
+             <td>Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; twipsy is an updated version, which doesn't rely on images, uses css3 for animations, data-attributes for local title storage, and now jquery 1.7's new event api!</td>
            </tr>
            <tr>
              <td><a href="./javascript.html#popover">bootstrap-popover.js</a></td>
              <td>The popover plugin provides a simple interface for adding popovers to your application. It extends the <a href="#twipsy">boostrap-twipsy.js</a> plugin, so be sure to grab that file as well when including popovers in your project!</td>
            </tr>
+           </tr>
+           <tr>
+             <td><a href="./javascript.html#alert">bootstrap-alert.js</a></td>
+             <td>The alert plugin is a tiny class for adding close functionality to alerts.</td>
+           </tr>
            <tr>
               <td><a href="./javascript.html#button">bootstrap-button.js</a></td>
-              <td>This plugin offers additional functionality for managing button state.</td>
+              <td>This plugin offers additional functionality for managing button state in single buttons and button sets.</td>
             </tr>
             <tr>
               <td><a href="./javascript.html#collapse">bootstrap-collapse.js</a></td>
@@ -161,7 +165,6 @@
        <h3>Is javascript necessary?</h3>
        <p><strong>Nope!</strong> Bootstrap is designed first and foremost to be a CSS library. This javascript provides a basic interactive layer on top of the included styles.</p>
        <p>However, for those who do need javascript, we've provided the plugins above to help you understand how to integrate Bootstrap with javascript and to give you a quick, lightweight option for the basic functionality right away.</p>
-       <p>For more information and to see some live demos, please refer to our <a href="./javascript.html">plugin documentation page</a>.</p>
      </div>
    </div>
 </section>
@@ -265,7 +268,7 @@ $('#myModal').modal({
           </table>
 
 <pre class="prettyprint linenums">
-$('#myModal').bind('hidden', function () {
+$('#myModal').on('hidden', function () {
   // do something ...
 })</pre>
           <h3>Demo</h3>
@@ -301,7 +304,7 @@ $('#myModal').bind('hidden', function () {
       </div>
       <div class="row">
         <div class="span3 columns">
-          <p>This plugin is for adding dropdown interaction to the Bootstrap navbar or tabbed navigations.</p>
+          <p>This plugin is for adding generic dropdown interactions to things like navigation top bars and tabs.</p>
           <a href="../js/bootstrap-dropdown.js" target="_blank" class="btn primary">Download</a>
         </div>
         <div class="span9 columns">
@@ -375,7 +378,7 @@ $('#myModal').bind('hidden', function () {
       </div>
       <div class="row">
         <div class="span3 columns">
-          <p>This plugin is for adding the scrollspy (auto updating nav) interaction to the bootstrap navbar.</p>
+          <p>The ScrollSpy plugin is for automatically updating nav targets based on scroll position.</p>
           <a href="../js/bootstrap-scrollspy.js" target="_blank" class="btn primary">Download</a>
         </div>
         <div class="span9 columns">
@@ -449,7 +452,7 @@ $('#myModal').bind('hidden', function () {
       </div>
       <div class="row">
         <div class="span3 columns">
-          <p>This plugin adds quick, dynamic tab and pill functionality.</p>
+          <p>This plugin adds quick, dynamic tab and pill functionality for transitioning through local content.</p>
           <a href="../js/bootstrap-tab.js" target="_blank" class="btn primary">Download</a>
         </div>
         <div class="span9 columns">
@@ -510,7 +513,7 @@ $('#myModal').bind('hidden', function () {
           </table>
 
           <pre class="prettyprint linenums">
-$('a[data-toggle="tab"]').bind('shown', function (e) {
+$('a[data-toggle="tab"]').on('shown', function (e) {
   e.target // activated tab
   e.relatedTarget // previous tab
 })</pre>
@@ -529,22 +532,22 @@ $('a[data-toggle="tab"]').bind('shown', function (e) {
             </li>
           </ul>
           <div id="myTabContent" class="tab-content">
-            <div class="active tab-pane" id="home">
+            <div class="tab-pane fade in active" id="home">
               <p>Raw denim you probably haven't heard of them jean shorts Austin. Nesciunt tofu stumptown aliqua, retro synth master cleanse. Mustache cliche tempor, williamsburg carles vegan helvetica. Reprehenderit butcher retro keffiyeh dreamcatcher synth. Cosby sweater eu banh mi, qui irure terry richardson ex squid. Aliquip placeat salvia cillum iphone. Seitan aliquip quis cardigan american apparel, butcher voluptate nisi qui.</p>
             </div>
-            <div class="tab-pane" id="profile">
+            <div class="tab-pane fade" id="profile">
               <p>Food truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid. Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson artisan four loko farm-to-table craft beer twee. Qui photo booth letterpress, commodo enim craft beer mlkshk aliquip jean shorts ullamco ad vinyl cillum PBR. Homo nostrud organic, assumenda labore aesthetic magna delectus mollit. Keytar helvetica VHS salvia yr, vero magna velit sapiente labore stumptown. Vegan fanny pack odio cillum wes anderson 8-bit, sustainable jean shorts beard ut DIY ethical culpa terry richardson biodiesel. Art party scenester stumptown, tumblr butcher vero sint qui sapiente accusamus tattooed echo park.</p>
             </div>
-            <div class="tab-pane" id="messages">
+            <div class="tab-pane fade" id="messages">
               <p>Banksy do proident, brooklyn photo booth delectus sunt artisan sed organic exercitation eiusmod four loko. Quis tattooed iphone esse aliqua. Master cleanse vero fixie mcsweeney's. Ethical portland aute, irony food truck pitchfork lomo eu anim. Aesthetic blog DIY, ethical beard leggings tofu consequat whatever cardigan nostrud. Helvetica you probably haven't heard of them carles, marfa veniam occaecat lomo before they sold out in shoreditch scenester sustainable thundercats. Consectetur tofu craft beer, mollit brunch fap echo park pitchfork mustache dolor.</p>
             </div>
-            <div class="tab-pane" id="settings">
+            <div class="tab-pane fade" id="settings">
               <p>Sunt qui biodiesel mollit officia, fanny pack put a bird on it thundercats seitan squid ad wolf bicycle rights blog. Et aute readymade farm-to-table carles 8-bit, nesciunt nulla etsy adipisicing organic ea. Master cleanse mollit high life, next level Austin nesciunt american apparel twee mustache adipisicing reprehenderit hoodie portland irony. Aliqua tofu quinoa +1 commodo eiusmod. High life williamsburg cupidatat twee homo leggings. Four loko vinyl DIY consectetur nisi, marfa retro keffiyeh vegan. Fanny pack viral retro consectetur gentrify fap.</p>
             </div>
-            <div class="tab-pane" id="dropdown1">
+            <div class="tab-pane fade" id="dropdown1">
               <p>Etsy mixtape wayfarers, ethical wes anderson tofu before they sold out mcsweeney's organic lomo retro fanny pack lo-fi farm-to-table readymade. Messenger bag gentrify pitchfork tattooed craft beer, iphone skateboard locavore carles etsy salvia banksy hoodie helvetica. DIY synth PBR banksy irony. Leggings gentrify squid 8-bit cred pitchfork. Williamsburg banh mi whatever gluten-free, carles pitchfork biodiesel fixie etsy retro mlkshk vice blog. Scenester cred you probably haven't heard of them, vinyl craft beer blog stumptown. Pitchfork sustainable tofu synth chambray yr.</p>
             </div>
-            <div class="tab-pane" id="dropdown2">
+            <div class="tab-pane fade" id="dropdown2">
               <p>Trust fund seitan letterpress, keytar raw denim keffiyeh etsy art party before they sold out master cleanse gluten-free squid scenester freegan cosby sweater. Fanny pack portland seitan DIY, art party locavore wolf cliche high life echo park Austin. Cred vinyl keffiyeh DIY salvia PBR, banh mi before they sold out farm-to-table VHS viral locavore cosby sweater. Lomo wolf viral, mustache readymade thundercats keffiyeh craft beer marfa ethical. Wolf salvia freegan, sartorial keffiyeh echo park vegan.</p>
             </div>
           </div>
@@ -561,7 +564,7 @@ $('a[data-toggle="tab"]').bind('shown', function (e) {
       </div>
       <div class="row">
         <div class="span3 columns">
-          <p>Based on the excellent jQuery.tipsy plugin written by Jason Frame; twipsy is an updated version, which doesn't rely on images, uses css3 for animations, and data-attributes for title storage!</p>
+          <p>Inspired by the excellent jQuery.tipsy plugin written by Jason Frame; twipsy is an updated version, which doesn't rely on images, uses css3 for animations, data-attributes for local title storage, and now jquery 1.7's new event api!</p>
           <a href="../js/bootstrap-twipsy.js" target="_blank" class="btn primary">Download</a>
         </div>
         <div class="span9 columns">
@@ -591,16 +594,16 @@ $('a[data-toggle="tab"]').bind('shown', function (e) {
                <td>how to position the tooltip - above | below | left | right</td>
              </tr>
              <tr>
-               <td>live</td>
-               <td>boolean</td>
+               <td>selector</td>
+               <td>string</td>
                <td>false</td>
-               <td>use event delegation instead of individual event handlers</td>
+               <td>If a selector is provided, twipsy objects will be delegated to the specified targets.</td>
              </tr>
              <tr>
-               <td>offset</td>
-               <td>number</td>
-               <td>0</td>
-               <td>pixel offset of tooltip from target element</td>
+               <td>title</td>
+               <td>string | function</td>
+               <td>''</td>
+               <td>default title value if `title` tag isn't present</td>
              </tr>
              <tr>
                <td>trigger</td>
@@ -622,7 +625,8 @@ $('a[data-toggle="tab"]').bind('shown', function (e) {
           </table>
           <p><span class="label notice">Notice</span> Individual twipsy instance options can alternatively be specified through the use of data attributes.</code></p>
           <h3>Markup</h3>
-          For performance reasons, the Twipsy and Popover data-apis are opt in. If you would like to use them just set the live flag to true, however we recommend you know what you are doing if you do that. :)
+          <p>
+          For performance reasons, the Twipsy and Popover data-apis are opt in. If you would like to use them just specify a selector option.</p>
           <h3>Methods</h3>
           <h4>$().twipsy(options)</h4>
           <p>Attaches a twipsy handler to an element collection.</p>
@@ -673,12 +677,6 @@ $('a[data-toggle="tab"]').bind('shown', function (e) {
                <td>true</td>
                <td>apply a css fade transition to the tooltip</td>
              </tr>
-             <tr>
-               <td>delay</td>
-               <td>number | object</td>
-               <td>0</td>
-               <td>delay before showing/hiding the tooltip (ms)</td>
-             </tr>
              <tr>
                <td>placement</td>
                <td>string</td>
@@ -686,16 +684,10 @@ $('a[data-toggle="tab"]').bind('shown', function (e) {
                <td>how to position the popover - above | below | left | right</td>
              </tr>
              <tr>
-               <td>live</td>
-               <td>boolean</td>
+               <td>selector</td>
+               <td>string</td>
                <td>false</td>
-               <td>use event delegation instead of individual event handlers</td>
-             </tr>
-             <tr>
-               <td>offset</td>
-               <td>number</td>
-               <td>0</td>
-               <td>pixel offset of tooltip from target element</td>
+               <td>if a selector is provided, twipsy objects will be delegated to the specified targets</td>
              </tr>
              <tr>
                <td>trigger</td>
@@ -703,12 +695,34 @@ $('a[data-toggle="tab"]').bind('shown', function (e) {
                <td>'hover'</td>
                <td>how tooltip is triggered - hover | focus | manual</td>
              </tr>
+             <tr>
+               <td>title</td>
+               <td>string | function</td>
+               <td>''</td>
+               <td>default title value if `title` attribute isn't present</td>
+             </tr>
+             <tr>
+               <td>content</td>
+               <td>string | function</td>
+               <td>''</td>
+               <td>default content value if `data-content` attribute isn't present</td>
+             </tr>
+             <tr>
+               <td>delay</td>
+               <td>number | object</td>
+               <td>0</td>
+               <td>
+                <p>delay showing/hiding the popover (ms)</p>
+                <p>If a number is supplied, delay is applied to both hide/show</p>
+                <p>Object structure is: <code>delay: { show: 500, hide: 100 }</code></p>
+               </td>
+             </tr>
             </tbody>
           </table>
           <p><span class="label notice">Notice</span> Individual popover instance options can alternatively be specified through the use of data attributes.</code></p>
           <h3>Markup</h3>
           <p>
-          For performance reasons, the Twipsy and Popover data-apis are opt in. If you would like to use them just set the live flag to true, however we recommend you know what you are doing if you do that. :)
+          For performance reasons, the Twipsy and Popover data-apis are opt in. If you would like to use them just specify a the selector option.
           </p>
           <h3>Methods</h3>
           <h4>$().popover(options)</h4>
@@ -969,7 +983,7 @@ $('#myCollapsible').collapse({
           </table>
 
 <pre class="prettyprint linenums">
-$('#myCollapsible').bind('hidden', function () {
+$('#myCollapsible').on('hidden', function () {
   // do something ...
 })</pre>
           <h3>Demo</h3>
-- 
cgit v1.2.3


From f72a94ae2879ebfc5206dd40d5db175e13113850 Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Tue, 20 Dec 2011 23:28:48 -0800
Subject: update more readme changes - introduce target specificty convention
 to more plugins

---
 docs/javascript.html | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index 45a7a2fe8..8a9a203e7 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -112,7 +112,7 @@
      <div class="span9">
       <h3>What's included</h3>
        <p>Bring some of Bootstrap's primary components to life with custom <a href="http://jquery.com/" target="_blank">jQuery</a> plugins. We encourage you to extend and modify them to fit your specific development needs.</p>
-       <table class="striped-table">
+       <table class="bordered-table striped-table">
          <thead>
            <tr>
              <th style="width: 150px;">File</th>
@@ -186,7 +186,7 @@
           <h3>Using bootstrap-modal</h3>
           <pre class="prettyprint linenums">$('#myModal').modal(options)</pre>
           <h3>Options</h3>
-          <table class="striped-table">
+          <table class="bordered-table striped-table">
             <thead>
              <tr>
                <th style="width: 100px;">Name</th>
@@ -208,16 +208,11 @@
                <td>true</td>
                <td>Closes the modal when escape key is pressed</td>
              </tr>
-             <tr>
-               <td>show</td>
-               <td>boolean</td>
-               <td>true</td>
-               <td>Opens modal on class initialization</td>
-             </tr>
             </tbody>
           </table>
           <h3>Markup</h3>
-          <p>You can activate modals on your page easily without having to write a single line of javascript. Just set <code>data-toggle="modal"</code> on a controller element with a <code>data-target="#foo"</code> or <code>href="#foo"</code> which corresponds to a modal element id, and when clicked, it will launch your modal. To add modal options, just include them as additoinal data attributes.</p>
+          <p>You can activate modals on your page easily without having to write a single line of javascript. Just set <code>data-toggle="modal"</code> on a controller element with a <code>data-target="#foo"</code> or <code>href="#foo"</code> which corresponds to a modal element id, and when clicked, it will launch your modal.</p>
+          <p>Also, to add options to your modal instance, just include them as additional data attributes on either the control element or the modal markup itself.</p>
 <pre class="prettyprint linenums">
 &lt;a class="btn" data-toggle="modal" href="#myModal" &gt;Launch Modal&lt;/a&gt;
 </pre>
@@ -240,7 +235,7 @@ $('#myModal').modal({
           <pre class="prettyprint linenums">$('#myModal').modal('hide')</pre>
           <h3>Events</h3>
           <p>Bootstrap's modal class exposes a few events for hooking into modal functionality. </p>
-          <table class="striped-table">
+          <table class="bordered-table striped-table">
             <thead>
              <tr>
                <th style="width: 150px;">Event</th>
@@ -311,12 +306,14 @@ $('#myModal').on('hidden', function () {
           <h3>Using boostrap-dropdown.js</h3>
           <pre class="prettyprint linenums">$('.dropdown-toggle').dropdown()</pre>
           <h3>Markup</h3>
-          <p>To quickly add dropdown functionality to any element just add <code>data-toggle="dropdown"</code>. Any valid bootstrap dropdown will automatically be activated.</p>
+          <p>To quickly add dropdown functionality to any element just add <code>data-toggle="dropdown"</code> and any valid bootstrap dropdown will automatically be activated.</p>
+          <p><span class="label notice">Notice</span> For added control and flexibility, optionally specify a <code>data-target="#fat"</code> or <code>href="#fat"</code> - this allows you to target specific dropdowns.</p>
+
 <pre class="prettyprint linenums">
 &lt;ul class="tabs"&gt;
   &lt;li class="active"&gt;&lt;a href="#"&gt;Home&lt;/a&gt;&lt;/li&gt;
-  &lt;li class="dropdown"&gt;
-    &lt;a href="#" class="dropdown-toggle" data-toggle="dropdown"&gt;Dropdown&lt;/a&gt;
+  &lt;li id="secondary" class="dropdown"&gt;
+    &lt;a href="#secondary" class="dropdown-toggle" data-toggle="dropdown"&gt;Dropdown&lt;/a&gt;
     &lt;ul class="dropdown-menu"&gt;
       &lt;li&gt;&lt;a href="#"&gt;Secondary link&lt;/a&gt;&lt;/li&gt;
       &lt;li&gt;&lt;a href="#"&gt;Something else here&lt;/a&gt;&lt;/li&gt;
@@ -343,7 +340,7 @@ $('#myModal').on('hidden', function () {
                   <input type="text" class="search-query span2" placeholder="Search">
                 </form>
                 <ul class="nav secondary-nav">
-                  <li class="dropdown">
+                  <li id="fat-menu" class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown 1</a>
                     <ul class="dropdown-menu">
                       <li><a href="#">Secondary link</a></li>
@@ -352,7 +349,7 @@ $('#myModal').on('hidden', function () {
                       <li><a href="#">Another link</a></li>
                     </ul>
                   </li>
-                  <li class="dropdown">
+                  <li id="mdo-menu" class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown">Dropdown 2</a>
                     <ul class="dropdown-menu">
                       <li><a href="#">Secondary link</a></li>
@@ -493,7 +490,7 @@ $('#myModal').on('hidden', function () {
 &lt;/script&gt;</pre>
           </p>
           <h3>Events</h3>
-          <table class="zebra-striped">
+          <table class="bordered-table striped-table">
             <thead>
              <tr>
                <th style="width: 150px;">Event</th>
@@ -571,7 +568,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           <h3>Using bootstrap-twipsy.js</h3>
           <pre class="prettyprint linenums">$('#example').twipsy(options)</pre>
           <h3>Options</h3>
-          <table class="striped-table">
+          <table class="bordered-table striped-table">
             <thead>
              <tr>
                <th style="width: 100px;">Name</th>
@@ -661,7 +658,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           <h3>Using boostrap-popover.js</h3>
           <pre class="prettyprint linenums">$('#example').popover(options)</pre>
           <h3>Options</h3>
-          <table class="striped-table">
+          <table class="bordered-table striped-table">
             <thead>
              <tr>
                <th style="width: 100px;">Name</th>
@@ -834,7 +831,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
   $('.btn').button('complete')
 &lt;/scrip&gt;</pre>
           <h3>Demo</h3>
-          <table class="striped-table">
+          <table class="bordered-table striped-table">
             <tbody>
              <tr>
                <td>Stateful</td>
@@ -903,7 +900,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           <h3>Using bootstrap-collapse.js</h3>
           <pre class="prettyprint linenums">$(".collapse").collapse()</pre>
           <h3>Options</h3>
-          <table class="striped-table">
+          <table class="bordered-table striped-table">
             <thead>
              <tr>
                <th style="width: 100px;">Name</th>
@@ -953,7 +950,7 @@ $('#myCollapsible').collapse({
           <p>
             Bootstrap's collapse class exposes a few events for hooking into collapse functionality.
           </p>
-          <table class="striped-table">
+          <table class="bordered-table striped-table">
             <thead>
              <tr>
                <th style="width: 150px;">Event</th>
-- 
cgit v1.2.3


From 80cb760fac507ce207a6174f8886417d32d4b5ed Mon Sep 17 00:00:00 2001
From: Jacob Thornton <jacobthornton@gmail.com>
Date: Wed, 21 Dec 2011 13:29:12 -0800
Subject: animate -> animation

---
 docs/javascript.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index 8a9a203e7..8dc3ba9d8 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -579,7 +579,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
             </thead>
             <tbody>
              <tr>
-               <td>animate</td>
+               <td>animation</td>
                <td>boolean</td>
                <td>true</td>
                <td>apply a css fade transition to the tooltip</td>
@@ -669,7 +669,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
             </thead>
             <tbody>
              <tr>
-               <td>animate</td>
+               <td>animation</td>
                <td>boolean</td>
                <td>true</td>
                <td>apply a css fade transition to the tooltip</td>
-- 
cgit v1.2.3