From 99b35150ee12d7a693de5ce45eded2f62e9e8354 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 22 Aug 2013 16:51:57 -0700 Subject: update outdated JSFiddle example --- javascript.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'javascript.html') diff --git a/javascript.html b/javascript.html index 62dbc07e6..e397efc40 100644 --- a/javascript.html +++ b/javascript.html @@ -1069,7 +1069,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 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 5d39794287c2a28d9d77ce3ac2b2c0fba0c24dfd Mon Sep 17 00:00:00 2001 From: bcarrell Date: Fri, 23 Aug 2013 12:10:52 -0400 Subject: docs: add explanation for adding tooltips to disabled elements, closes #10049 --- javascript.html | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'javascript.html') diff --git a/javascript.html b/javascript.html index e397efc40..07d528a17 100644 --- a/javascript.html +++ b/javascript.html @@ -805,6 +805,10 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {

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).

+
+

Tooltips on disabled elements require placing the tooltip on an outer element instead

+

If you'd like to add a tooltip to a disabled element, place the element inside of a <div> or <span> and apply the tooltip to that element instead.

+

Usage

Trigger the tooltip via JavaScript:

-- cgit v1.2.3 From 3d7294238427f23a9110f9e00aaa4f7a79222a5f Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Fri, 23 Aug 2013 11:08:37 -0700 Subject: tweak #10081 phrasing --- javascript.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'javascript.html') diff --git a/javascript.html b/javascript.html index 07d528a17..0dffa5db8 100644 --- a/javascript.html +++ b/javascript.html @@ -804,10 +804,9 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {

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).

-
-

Tooltips on disabled elements require placing the tooltip on an outer element instead

-

If you'd like to add a tooltip to a disabled element, place the element inside of a <div> or <span> and apply the tooltip to that element instead.

+

Tooltips on disabled elements require wrapper elements

+

To add a tooltip to a disabled or .disabled element, put the element inside of a <div> or <span>, and apply the tooltip to that element instead.

Usage

-- cgit v1.2.3 From 0f669b6dcb5c47063c43cd6defcf9697874a0fab Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Fri, 23 Aug 2013 11:09:01 -0700 Subject: repeat #10081 caveat for popovers too --- javascript.html | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'javascript.html') diff --git a/javascript.html b/javascript.html index 0dffa5db8..40ea1a924 100644 --- a/javascript.html +++ b/javascript.html @@ -970,6 +970,10 @@ $('#myTooltip').on('hidden.bs.tooltip', function () {

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).

+
+

Popovers on disabled elements require wrapper elements

+

To add a popover to a disabled or .disabled element, put the element inside of a <div> or <span>, and apply the popover to that element instead.

+

Static popover

Four options are available: top, right, bottom, and left aligned.

-- cgit v1.2.3 From ec7fa0a25488e2887db9666ea8014777a743ac55 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Fri, 23 Aug 2013 11:14:54 -0700 Subject: fix data-api portion of #10084 --- javascript.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'javascript.html') diff --git a/javascript.html b/javascript.html index 40ea1a924..8da1cb590 100644 --- a/javascript.html +++ b/javascript.html @@ -273,7 +273,7 @@ $('#myModal').on('show.bs.modal', function (e) { remote path false -

If a remote URL is provided, content will be loaded 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 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:

{% highlight html %} Click me {% endhighlight %} -- cgit v1.2.3 From e3f97190965c2800ad94f216683b3abf0119ac52 Mon Sep 17 00:00:00 2001 From: wangsai Date: Sat, 24 Aug 2013 11:09:33 +0800 Subject: complete missed --- javascript.html | 1 + 1 file changed, 1 insertion(+) (limited to 'javascript.html') diff --git a/javascript.html b/javascript.html index 8da1cb590..4563cd0be 100644 --- a/javascript.html +++ b/javascript.html @@ -277,6 +277,7 @@ $('#myModal').on('show.bs.modal', function (e) { {% highlight html %} Click me {% endhighlight %} + -- cgit v1.2.3