From bc9335650c0825ddf5805ebcdb513f71540d9c82 Mon Sep 17 00:00:00 2001 From: Chris Rebert 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()

Toggles the dropdown menu of a given navbar or tabbed navigation.

Events

+

All dropdown events are fired at the .dropdown-menu's parent element.

-- cgit v1.2.3 From 4b194471b0352fa583e074c4394c1fd5085cf832 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Fri, 31 Jan 2014 10:32:32 -0800 Subject: fix #12484 --- 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 b0e1287ba..9f57d0725 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -941,12 +941,12 @@ $('#example').tooltip(options) {% highlight html linenos %} -Hover over me +Hover over me
- Tooltip! + Some tooltip text!
-- cgit v1.2.3 From e9212e8ab7fe3f0be823ae836696a397cb4f908f Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 2 Feb 2014 22:11:18 -0800 Subject: update docs about destination of remote modal content; fixes #12494 --- 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 9f57d0725..e022767e3 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -342,7 +342,7 @@ $('#myModal').on('show.bs.modal', function (e) { -
remote path false

If a remote URL is provided, content will be loaded one time via jQuery's load method and injected into the root of the modal element. If you're using the data-api, you may alternatively use the href attribute to specify the remote source. An example of this is shown below:

+

If a remote URL is provided, content will be loaded one time via jQuery's load method and injected into the .modal-content div. If you're using the data-api, you may alternatively use the href attribute to specify the remote source. An example of this is shown below:

{% highlight html %} Click me {% endhighlight %} -- cgit v1.2.3 From 27e080df4b80791860624ba17d4b57608200d5e0 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 2 Feb 2014 22:51:19 -0800 Subject: fix #12527 --- docs/javascript.html | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'docs/javascript.html') diff --git a/docs/javascript.html b/docs/javascript.html index e022767e3..8932ff295 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -548,6 +548,10 @@ $('#myModal').on('hidden.bs.modal', function (e) { {% highlight js %} $('.dropdown-toggle').dropdown() {% endhighlight %} +
+

data-toggle="dropdown" still required

+

Regardless of whether you call your dropdown via JavaScript or instead use the data-api, data-toggle="dropdown" is always required to be present on the dropdown's trigger element.

+

Options

None

-- cgit v1.2.3 From ebd132ce68b79a95daf6ef91225304e9656cd4a4 Mon Sep 17 00:00:00 2001 From: Mark Otto 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

Plugins can be included individually (using Bootstrap's individual *.js files), or all at once (using bootstrap.js or the minified bootstrap.min.js).

-

Do not attempt to include both.

-

Both bootstrap.js and bootstrap.min.js contain all plugins in a single file.

+

Using the compiled JavaScript

+

Both bootstrap.js and bootstrap.min.js contain all plugins in a single file. Include only one.

+
+ +
+

Component data attributes

+

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.

-- cgit v1.2.3 From bdf9ce4c45b81e62ab7ebd88a9e3daa98ecdd10c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zlatan=20Vasovi=C4=87?= 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 () { @@ -1552,10 +1552,10 @@ $('.btn').button() -- cgit v1.2.3 From 77eaa808dbe68d232f3c8e0416ed25fbc12f1ffa Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Mon, 10 Feb 2014 10:12:28 -0800 Subject: tweak phrasing for hopefully greater clarity --- 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 2d42da203..16cd66e65 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -21,7 +21,7 @@ lead: "Bring Bootstrap's components to life with over a dozen custom jQuery plug

Component data attributes

-

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.

+

Don't use data attributes from multiple plugins on the same element. For example, a button cannot both have a tooltip and toggle a modal. To accomplish this, use a wrapping element.

-- cgit v1.2.3