From 95c796d61e40e7c12aef75ba8dff4bf211ccbb8f Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Sat, 31 Aug 2013 20:43:57 +0200 Subject: Fix #10324: Add opt-in note to tooltip docs * Re-added a note (now callout) about need to opt in to tooltip docs * Converted same note in popover section to callout --- javascript.html | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'javascript.html') diff --git a/javascript.html b/javascript.html index 48aaf2cd9..e9f14ee86 100644 --- a/javascript.html +++ b/javascript.html @@ -461,6 +461,8 @@ $('#myModal').on('hidden.bs.modal', function () { Dropdown + + @@ -819,6 +821,10 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) { +
+

Opt-in functionality

+

For performance reasons, the Tooltip and Popover data-apis are opt-in. If you would like to use them just specify a selector option.

+

Tooltips in button groups and input groups require special setting

When using tooltips on elements within a .btn-group or an .input-group, you'll have to specify the option container: 'body' (documented below) to avoid unwanted side effects (such as the element growing wider and/or losing its rounded corners when the tooltip is triggered).

@@ -985,6 +991,10 @@ $('#myTooltip').on('hidden.bs.tooltip', function () {

Plugin dependency

Popovers require the tooltip plugin to be included in your version of Bootstrap.

+
+

Opt-in functionality

+

For performance reasons, the Tooltip and Popover data-apis are opt-in. If you would like to use them just specify a selector option.

+

Popovers in button groups and input groups require special setting

When using popovers on elements within a .btn-group or an .input-group, you'll have to specify the option container: 'body' (documented below) to avoid unwanted side effects (such as the element growing wider and/or losing its rounded corners when the popover is triggered).

@@ -1016,6 +1026,7 @@ $('#myTooltip').on('hidden.bs.tooltip', function () {

Popover bottom

+

Sed posuere consectetur est at lobortis. Aenean eu leo quam. Pellentesque ornare sem lacinia quam venenatis vestibulum.

@@ -1141,9 +1152,6 @@ $('#myTooltip').on('hidden.bs.tooltip', function () {

Options for individual popovers can alternatively be specified through the use of data attributes, as explained above.

-

Markup

-

For performance reasons, the Tooltip and Popover data-apis are opt in. If you would like to use them just specify a selector option.

-

Methods

$().popover(options)

Initializes popovers for an element collection.

-- cgit v1.2.3 From 1ebd2826939b263be8ceeb9b3e8339d13547dfa9 Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Tue, 10 Sep 2013 23:31:57 +0200 Subject: Rephrase text --- javascript.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'javascript.html') diff --git a/javascript.html b/javascript.html index e9f14ee86..eaceadab3 100644 --- a/javascript.html +++ b/javascript.html @@ -823,7 +823,7 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {

Opt-in functionality

-

For performance reasons, the Tooltip and Popover data-apis are opt-in. If you would like to use them just specify a selector option.

+

For performance reasons, the Tooltip and Popover data-apis are opt-in, meaning you must initialize them yourself.

Tooltips in button groups and input groups require special setting

@@ -993,7 +993,7 @@ $('#myTooltip').on('hidden.bs.tooltip', function () {

Opt-in functionality

-

For performance reasons, the Tooltip and Popover data-apis are opt-in. If you would like to use them just specify a selector option.

+

For performance reasons, the Tooltip and Popover data-apis are opt-in, meaning you must initialize them yourself.

Popovers in button groups and input groups require special setting

-- cgit v1.2.3 From a1b0311597fdf79965044e6cb17c1c1acf08b1b6 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 11 Sep 2013 19:53:32 -0700 Subject: document jQuery version requirement; fixes #10355 --- javascript.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'javascript.html') diff --git a/javascript.html b/javascript.html index 8305632ac..ecab0bf9e 100644 --- a/javascript.html +++ b/javascript.html @@ -24,7 +24,7 @@ base_url: "../"

Plugin dependencies

-

Some plugins and CSS components depend on other plugins. If you include plugins individually, make sure to check for these dependencies in the docs. Also note that all plugins depend on jQuery (this means jQuery must be included before the plugin files).

+

Some plugins and CSS components depend on other plugins. If you include plugins individually, make sure to check for these dependencies in the docs. Also note that all plugins depend on jQuery (this means jQuery must be included before the plugin files). Consult our bower.json to see which versions of jQuery are supported.

Data attributes

-- cgit v1.2.3 From 3a20ec410be05dac4138d1047cb47867d2eedd0c Mon Sep 17 00:00:00 2001 From: ggam Date: Sat, 14 Sep 2013 19:15:42 +0200 Subject: Removed unneeded 'accordion-toggle' class. Fixes #10481 --- javascript.html | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'javascript.html') diff --git a/javascript.html b/javascript.html index ecab0bf9e..c3c29c582 100644 --- a/javascript.html +++ b/javascript.html @@ -1456,7 +1456,7 @@ $('.btn-group').button()

- + Collapsible Group Item #1

@@ -1470,7 +1470,7 @@ $('.btn-group').button()

- + Collapsible Group Item #2

@@ -1484,7 +1484,7 @@ $('.btn-group').button()

- + Collapsible Group Item #3

@@ -1502,7 +1502,7 @@ $('.btn-group').button()

- + Collapsible Group Item #1

@@ -1516,7 +1516,7 @@ $('.btn-group').button()

- + Collapsible Group Item #2

@@ -1530,7 +1530,7 @@ $('.btn-group').button()

- + Collapsible Group Item #3

-- cgit v1.2.3 From 31f32e848509392258e8802b07954730422075dd Mon Sep 17 00:00:00 2001 From: Andrew Homeyer Date: Sun, 15 Sep 2013 21:07:15 -0600 Subject: remove duplicate text in documentation for popover --- javascript.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'javascript.html') diff --git a/javascript.html b/javascript.html index ecab0bf9e..0f97d1c6c 100644 --- a/javascript.html +++ b/javascript.html @@ -1111,7 +1111,7 @@ $('#myTooltip').on('hidden.bs.tooltip', function () { selector string false - if a selector is provided, tooltip objects will be delegated to the specified targets if a selector is provided, tooltip objects will be delegated to the specified targets. in practice, this is used to enable dynamic HTML content to have popovers added. See this and an informative example. + if a selector is provided, tooltip objects will be delegated to the specified targets. in practice, this is used to enable dynamic HTML content to have popovers added. See this and an informative example. trigger -- cgit v1.2.3 From 4e962c572e57ff0ee30e490f3f7eb819415c952f Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 17 Sep 2013 17:41:58 -0700 Subject: fix #10692 --- javascript.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'javascript.html') diff --git a/javascript.html b/javascript.html index d36a7667a..5bac259e2 100644 --- a/javascript.html +++ b/javascript.html @@ -750,10 +750,10 @@ $('#myTab li:eq(2) a').tab('show') // Select third tab (0-indexed)

{% highlight html %}
-- cgit v1.2.3 From 5d6e1d742def19a730da188f0269f938928e503b Mon Sep 17 00:00:00 2001 From: Alex Kalicki Date: Thu, 26 Sep 2013 17:49:03 -0400 Subject: Resolves #10726 - clarifies javascript tab markup in docs --- javascript.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'javascript.html') diff --git a/javascript.html b/javascript.html index 5bac259e2..ff07387fd 100644 --- a/javascript.html +++ b/javascript.html @@ -713,7 +713,7 @@ $('#myTab li:eq(2) a').tab('show') // Select third tab (0-indexed) {% endhighlight %}

Markup

-

You can activate a tab or pill navigation without writing any JavaScript by simply specifying data-toggle="tab" or data-toggle="pill" on an element. Adding the nav and nav-tabs classes to the tab ul will apply the Bootstrap tab styling.

+

You can activate a tab or pill navigation without writing any JavaScript by simply specifying data-toggle="tab" or data-toggle="pill" on an element. Adding the nav and nav-tabs classes to the tab ul will apply the Bootstrap tab styling, while adding the nav and nav-pills classes will apply pill styling.

{% highlight html %}
    -- cgit v1.2.3 From 730d7f0b13143061fd0607cbe6c303d7bd8b74ec Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 8 Oct 2013 11:44:30 -0700 Subject: fix #10986 --- javascript.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'javascript.html') diff --git a/javascript.html b/javascript.html index ff07387fd..67cc9779f 100644 --- a/javascript.html +++ b/javascript.html @@ -253,7 +253,7 @@ $('#myModal').on('show.bs.modal', function (e) { backdrop - boolean + boolean or the string 'static' true Includes a modal-backdrop element. Alternatively, specify static for a backdrop which doesn't close the modal on click. -- cgit v1.2.3 From ef1fc34e616a0efda482ec54247a84d589244d55 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Wed, 9 Oct 2013 19:29:25 -0700 Subject: use data-ride="carousel" in the docs & examples; fixes #11005 --- javascript.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'javascript.html') diff --git a/javascript.html b/javascript.html index 67cc9779f..5eb742cd2 100644 --- a/javascript.html +++ b/javascript.html @@ -1665,7 +1665,7 @@ $('#myCollapsible').on('hidden.bs.collapse', function () {

    The slideshow below shows a generic plugin and component for cycling through elements like a carousel.

    - {% highlight html %} -