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/templates/pages/javascript.mustache | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/templates/pages/javascript.mustache') diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 5f8883bdf..3c412a982 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -183,7 +183,7 @@ $('#myModal').on('show', function (e) { <a href="#myModal" role="button" class="btn" data-toggle="modal">{{_i}}Launch demo modal{{/i}}</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/templates/pages/javascript.mustache | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/templates/pages/javascript.mustache') diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 3c412a982..2cdb172db 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -49,7 +49,7 @@

{{_i}}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:{{/i}} 

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

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

+

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

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

{{_i}}Programmatic API{{/i}}

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

-

{{_i}}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').{{/i}}

+

{{_i}}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').{{/i}}

{{_i}}Events{{/i}}

-

{{_i}}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.{{/i}}

+

{{_i}}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.{{/i}}

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

 $('#myModal').on('show', function (e) {
-- 
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/templates/pages/javascript.mustache | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'docs/templates/pages/javascript.mustache')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 2cdb172db..b707ebe20 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -855,6 +855,16 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
           {{_i}}Click to toggle popover{{/i}}
         
 
+        
{{_i}}Four directions{{/i}}

+        

+          
+        
{{! /example }}
+
 
         

 
-- 
cgit v1.2.3


From aec8b089307d6bc8787aceb7001313e3751048c1 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Mon, 24 Sep 2012 23:32:55 -0700
Subject: update docs for tooltip html + the dropdown methods api

---
 docs/templates/pages/javascript.mustache | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'docs/templates/pages/javascript.mustache')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index b707ebe20..e53c88abe 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -436,8 +436,8 @@ $('#myModal').on('hidden', function () {
           
{{_i}}None{{/i}}

 
           
{{_i}}Methods{{/i}}

-          
$().dropdown()

-          
{{_i}}A programatic api for activating menus for a given navbar or tabbed navigation.{{/i}}

+          
$().dropdown('toggle')

+          
{{_i}}A programatic api for toggling menus for a given navbar or tabbed navigation.{{/i}}

         
 
 
@@ -734,7 +734,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
              
                {{_i}}html{{/i}}
                {{_i}}boolean{{/i}}
-               true
+               false
                {{_i}}Insert html into the tooltip. If false, jquery's text method will be used to insert content into the dom. Use text if you're worried about XSS attacks.{{/i}}
              
              
@@ -894,7 +894,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
            
              {{_i}}html{{/i}}
              {{_i}}boolean{{/i}}
-             true
+             false
              {{_i}}Insert html into the popover. If false, jquery's text method will be used to insert content into the dom. Use text if you're worried about XSS attacks.{{/i}}
            
            
-- 
cgit v1.2.3


From 8ecffcb32fc0d3a423f87fac9e613498b5104fe7 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Fri, 28 Sep 2012 10:39:15 -0700
Subject: fixes #5334: html snippet comments

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

(limited to 'docs/templates/pages/javascript.mustache')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index e53c88abe..0406fd769 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -179,10 +179,10 @@ $('#myModal').on('show', function (e) {
             {{_i}}Launch demo modal{{/i}}
           {{! /example }}
 
-<-- Button to trigger modal -->
+<!-- Button to trigger modal -->
 <a href="#myModal" role="button" class="btn" data-toggle="modal">{{_i}}Launch demo modal{{/i}}</a>
 
-<-- Modal -->
+<!-- Modal -->
 <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>
-- 
cgit v1.2.3


From fd1e9b1498f3bae87025839bf44865d937795cc7 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Mon, 1 Oct 2012 13:28:54 -0700
Subject: fix copy on modal popover button doodad

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

(limited to 'docs/templates/pages/javascript.mustache')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 0406fd769..88ddbf6e0 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -154,7 +154,7 @@ $('#myModal').on('show', function (e) {
               
Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem.

 
               
{{_i}}Popover in a modal{{/i}}

-              
{{_i}}This button should trigger a popover on hover.{{/i}}

+              
{{_i}}This button should trigger a popover on click.{{/i}}

 
               
{{_i}}Tooltips in a modal{{/i}}

               
{{_i}}This link and that link should have tooltips on hover.{{/i}}

-- 
cgit v1.2.3


From e73cd15fc8eaa80ab7913d51a23a8e61c0e1bb30 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 2 Oct 2012 17:01:18 -0700
Subject: copy and style changes to improve docs rendering on mobile devices

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

(limited to 'docs/templates/pages/javascript.mustache')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 88ddbf6e0..6c49d9bc4 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -2,7 +2,7 @@
 ================================================== -->
 

   

-    
{{_i}}JavaScript for Bootstrap{{/i}}

+    
{{_i}}JavaScript{{/i}}

     
{{_i}}Bring Bootstrap's components to life—now with 13 custom jQuery plugins.{{/i}}
   

 

-- 
cgit v1.2.3


From 463eae25b0553161dc39875015ea62970c6edfbf Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 16 Oct 2012 12:37:36 -0500
Subject: clarify js docs individual or compiled section

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

(limited to 'docs/templates/pages/javascript.mustache')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 6c49d9bc4..34bf0fab7 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -41,7 +41,7 @@
           
 
           
{{_i}}Individual or compiled{{/i}}

-          
{{_i}}If you have downloaded the latest version of Bootstrap, both bootstrap.js and bootstrap.min.js contain all of the plugins listed on this page.{{/i}}

+          
{{_i}}Plugins can be included individually (though some have required dependencies), or all at once. Both bootstrap.js and bootstrap.min.js contain all plugins in a single file.{{/i}}

 
           
{{_i}}Data attributes{{/i}}

           
{{_i}}You can use all Bootstrap plugins purely through the markup API without writing a single line of JavaScript. This is Bootstrap's first class API and should be your first consideration when using a plugin.{{/i}}

-- 
cgit v1.2.3


From 0ac50d28b57b2221abf9ce935f4957d66ee7fcda Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 16 Oct 2012 20:18:50 -0700
Subject: fixes #5519: hellip in modal code

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

(limited to 'docs/templates/pages/javascript.mustache')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 34bf0fab7..849469f66 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -189,7 +189,7 @@ $('#myModal').on('show', function (e) {
     <h3 id="myModalLabel">Modal header</h3>
   </div>
   <div class="modal-body">
-    <p>{{_i}}One fine body…{{/i}}</p>
+    <p>{{_i}}One fine body…{{/i}}</p>
   </div>
   <div class="modal-footer">
     <button class="btn" data-dismiss="modal" aria-hidden="true">{{_i}}Close{{/i}}</button>
-- 
cgit v1.2.3


From 57eb2a801827ab2466f6ca4d5d470a72ae14e601 Mon Sep 17 00:00:00 2001
From: Mark Otto 
Date: Tue, 16 Oct 2012 20:28:07 -0700
Subject: more hellip on modals

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

(limited to 'docs/templates/pages/javascript.mustache')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index 849469f66..fbd94e4e2 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -117,7 +117,7 @@ $('#myModal').on('show', function (e) {
                 
{{_i}}Modal header{{/i}}

               
               

-                
{{_i}}One fine body…{{/i}}

+                
{{_i}}One fine body…{{/i}}

               

               

                 {{_i}}Close{{/i}}
@@ -132,7 +132,7 @@ $('#myModal').on('show', function (e) {
     <h3>{{_i}}Modal header{{/i}}</h3>
   </div>
   <div class="modal-body">
-    <p>{{_i}}One fine body…{{/i}}</p>
+    <p>{{_i}}One fine body…{{/i}}</p>
   </div>
   <div class="modal-footer">
     <a href="#" class="btn">{{_i}}Close{{/i}}</a>
-- 
cgit v1.2.3


From ac6625de5fb01067e6f64996c84e93ade654d7d5 Mon Sep 17 00:00:00 2001
From: Jacob Thornton 
Date: Wed, 17 Oct 2012 21:37:34 -0700
Subject: add updater function and rebuild

---
 docs/templates/pages/javascript.mustache | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'docs/templates/pages/javascript.mustache')

diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache
index fbd94e4e2..72d1fc5bb 100644
--- a/docs/templates/pages/javascript.mustache
+++ b/docs/templates/pages/javascript.mustache
@@ -1543,6 +1543,12 @@ $('.carousel').carousel({
                  {{_i}}exact match,
 case sensitive,
 case insensitive{{/i}}
                  {{_i}}Method used to sort autocomplete results. Accepts a single argument items and has the scope of the typeahead instance. Reference the current query with this.query.{{/i}}
                
+               
+                 {{_i}}updater{{/i}}
+                 {{_i}}function{{/i}}
+                 {{_i}}returns selected item{{/i}}
+                 {{_i}}The method used to return selected item. Accepts a single argument, the item and has the scope of the typeahead instance.{{/i}}
+               
                
                  {{_i}}highlighter{{/i}}
                  {{_i}}function{{/i}}
-- 
cgit v1.2.3