From 76e42edb29301be6d2f1014bbd64939d3f6f39a4 Mon Sep 17 00:00:00 2001 From: Geoff Young Date: Sun, 9 Sep 2012 18:58:23 -0400 Subject: Updated sample markup to reflect live demo. --- docs/javascript.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/javascript.html') diff --git a/docs/javascript.html b/docs/javascript.html index a530b21e0..91620a572 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -253,7 +253,7 @@ $('#myModal').on('show', function (e) { <a href="#myModal" role="button" class="btn" data-toggle="modal">Launch demo modal</a> <-- Modal --> -<div class="modal" id="myModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> +<div id="myModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true"> <div class="modal-header"> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <h3 id="myModalLabel">Modal header</h3> -- cgit v1.2.3 From e1deba30aa6b894aa8228cc9bfcec8490df47873 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 12 Sep 2012 16:22:52 -0700 Subject: fixes #5097: js docs typos --- docs/javascript.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/javascript.html') diff --git a/docs/javascript.html b/docs/javascript.html index 91620a572..324f978fd 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -120,7 +120,7 @@

That said, in some situations it may be desirable to turn this functionality off. Therefore, we also provide the ability to disable the data attribute API by unbinding all events on the body namespaced with `'data-api'`. This looks like this: 

$('body').off('.data-api')
-

Alternatively, to target a specific plugin, just include the plugins name as a namespace along with the data-api namespace like this:

+

Alternatively, to target a specific plugin, just include the plugin's name as a namespace along with the data-api namespace like this:

$('body').off('.alert.data-api')

Programmatic API

@@ -132,10 +132,10 @@ $("#myModal").modal() // initialized with defaults $("#myModal").modal({ keyboard: false }) // initialized with no keyboard $("#myModal").modal('show') // initializes and invokes show immediately

-

Each plugin also exposes it's raw constructor on a `Constructor` property: $.fn.popover.Constructor. If you'd like to get a particular plugin instance, retrieve it directly from an element: $('[rel=popover]').data('popover').

+

Each plugin also exposes its raw constructor on a `Constructor` property: $.fn.popover.Constructor. If you'd like to get a particular plugin instance, retrieve it directly from an element: $('[rel=popover]').data('popover').

Events

-

Bootstrap provides custom events for most plugin's unique actions. Generally, these come in an infinitive and past participle form - where the infinitive (ex. show) is triggered at the start of an event, and it's past participle form (ex. shown) is trigger on the completion of an action.

+

Bootstrap provides custom events for most plugin's unique actions. Generally, these come in an infinitive and past participle form - where the infinitive (ex. show) is triggered at the start of an event, and its past participle form (ex. shown) is trigger on the completion of an action.

All infinitive events provide preventDefault functionality. This provides the abililty to stop the execution of an action before it starts.

 $('#myModal').on('show', function (e) {
-- 
cgit v1.2.3


From 595e1a189c1911ada7c4bd4c769c28b1741611ac Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Thu, 13 Sep 2012 10:07:57 -0700
Subject: fixes #5119: javascript in navbar typo

---
 docs/javascript.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index 324f978fd..a0c707b8d 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -58,7 +58,7 @@
                 Components
               
               
  • 
-                Javascript
+                JavaScript
               
    • 
               
  • 
                 Customize
-- 
cgit v1.2.3


From cedb3c7c56887d4ca42296ee193f2ff08dfe9ac4 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 17 Sep 2012 23:03:18 -0700
Subject: fixes #5173: proper popover offsets; added docs examples to enable
 tests in the future

---
 docs/javascript.html | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index a0c707b8d..6c028e01e 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -925,6 +925,16 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           Click to toggle popover
         
 
+        
    Four directions
    
+        
    
+          
+        
    
+
 
         
    
 
-- 
cgit v1.2.3