From bc9335650c0825ddf5805ebcdb513f71540d9c82 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Mon, 20 Jan 2014 18:39:13 -0800
Subject: fix #12007 by clarifying target of dropdown events

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

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index 7d41a0378..4b9933bf7 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -557,6 +557,7 @@ $('.dropdown-toggle').dropdown()
   <p>Toggles the dropdown menu of a given navbar or tabbed navigation.</p>
 
   <h3>Events</h3>
+  <p>All dropdown events are fired at the <code>.dropdown-menu</code>'s parent element.</p>
   <div class="table-responsive">
     <table class="table table-bordered table-striped">
       <thead>
-- 
cgit v1.2.3


From ebd132ce68b79a95daf6ef91225304e9656cd4a4 Mon Sep 17 00:00:00 2001
From: Mark Otto <otto@github.com>
Date: Fri, 7 Feb 2014 01:10:21 -0800
Subject: Fixes #12611: Mention limitation of one plugin's data attributes per
 element

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

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index 8932ff295..24c1eb79d 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -15,8 +15,13 @@ lead: "Bring Bootstrap's components to life with over a dozen custom jQuery plug
   <p>Plugins can be included individually (using Bootstrap's individual <code>*.js</code> files), or all at once (using <code>bootstrap.js</code> or the minified <code>bootstrap.min.js</code>).</p>
 
   <div class="bs-callout bs-callout-danger">
-    <h4>Do not attempt to include both.</h4>
-    <p>Both <code>bootstrap.js</code> and <code>bootstrap.min.js</code> contain all plugins in a single file.</p>
+    <h4>Using the compiled JavaScript</h4>
+    <p>Both <code>bootstrap.js</code> and <code>bootstrap.min.js</code> contain all plugins in a single file. Include only one.</p>
+  </div>
+
+  <div class="bs-callout bs-callout-danger">
+    <h4>Component data attributes</h4>
+    <p>Don't mix data attributes from separate plugins on the same component. For example, a button cannot have a tooltip and toggle a modal. To accomplish this, use a wrapping element.</p>
   </div>
 
   <div class="bs-callout bs-callout-danger">
-- 
cgit v1.2.3


From bdf9ce4c45b81e62ab7ebd88a9e3daa98ecdd10c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= <legospace9876@gmail.com>
Date: Fri, 7 Feb 2014 19:31:08 +0100
Subject: Omit semicolons consistently in docs

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

(limited to 'docs/javascript.html')

diff --git a/docs/javascript.html b/docs/javascript.html
index 7cd9ede49..2d42da203 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -1444,10 +1444,10 @@ $('#my-alert').bind('closed.bs.alert', function () {
 </button>
 <script>
   $('#loading-example-btn').click(function () {
-    var btn = $(this);
-    btn.button('loading');
+    var btn = $(this)
+    btn.button('loading')
     $.ajax(...).always(function () {
-      btn.button('reset');
+      btn.button('reset')
     });
   });
 </script>
@@ -1552,10 +1552,10 @@ $('.btn').button()
 <button id="loading-example-btn" type="button" class="btn btn-primary" data-loading-text="loading stuff...">...</button>
 <script>
   $('#loading-example-btn').click(function () {
-    var btn = $(this);
-    btn.button('loading');
+    var btn = $(this)
+    btn.button('loading')
     $.ajax(...).always(function () {
-      btn.button('reset');
+      btn.button('reset')
     });
   });
 </script>
-- 
cgit v1.2.3