From abb112173e26c6785ee472ee3fa41bd06e16e1cc Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Tue, 25 Jun 2013 20:52:49 +0200 Subject: Add callout to docs: 3rd-party libs not supported --- docs/javascript.html | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'docs/javascript.html') diff --git a/docs/javascript.html b/docs/javascript.html index 955ad31f8..d8ddfa98c 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -64,6 +64,11 @@ $('#myModal').on('show.bs.modal', function (e) { if (!data) return e.preventDefault() // stops modal from being shown }) {% endhighlight %} + +
+

Third-party libraries

+

Bootstrap does not support third-party JavaScript libraries like Prototype or jQuery UI. Despite .noConflict and namespaced events, there may be compatibility problems that you need to fix on your own.

+
-- cgit v1.2.3 From 0f0e7fc3769c70525f21d50988041534a8efcc81 Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Tue, 25 Jun 2013 21:19:19 +0200 Subject: Add a link to the mailing list for JS help --- 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 d8ddfa98c..a46126a0a 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -67,7 +67,7 @@ $('#myModal').on('show.bs.modal', function (e) {

Third-party libraries

-

Bootstrap does not support third-party JavaScript libraries like Prototype or jQuery UI. Despite .noConflict and namespaced events, there may be compatibility problems that you need to fix on your own.

+

Bootstrap does not support third-party JavaScript libraries like Prototype or jQuery UI. Despite .noConflict and namespaced events, there may be compatibility problems that you need to fix on your own. Ask on the mailing list if you need help.

-- cgit v1.2.3 From a87ea9345beced2cea2009362c9aead9a2510e09 Mon Sep 17 00:00:00 2001 From: Julian Thilo Date: Tue, 25 Jun 2013 21:59:34 +0200 Subject: Add IDs, adjust text --- 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 a46126a0a..9a5a5b6f0 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -65,9 +65,9 @@ $('#myModal').on('show.bs.modal', function (e) { }) {% endhighlight %} -
+

Third-party libraries

-

Bootstrap does not support third-party JavaScript libraries like Prototype or jQuery UI. Despite .noConflict and namespaced events, there may be compatibility problems that you need to fix on your own. Ask on the mailing list if you need help.

+

Bootstrap does not officially support third-party JavaScript libraries like Prototype or jQuery UI. Despite .noConflict and namespaced events, there may be compatibility problems that you need to fix on your own. Ask on the mailing list if you need help.

-- cgit v1.2.3 From 694c650f8e61a16fb18bf1c7c6c092e26ad52333 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 25 Jun 2013 19:32:17 -0700 Subject: copyedit JS docs --- docs/javascript.html | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'docs/javascript.html') diff --git a/docs/javascript.html b/docs/javascript.html index 9a5a5b6f0..d1c987904 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -80,7 +80,7 @@ $('#myModal').on('show.bs.modal', function (e) {

Transitions transition.js

About transitions

-

For simple transition effects, include transition.js once alongside the other JS files. If you're using the compiled (or minified) bootstrap.js, there is no need to include this—it's already there.

+

For simple transition effects, include transition.js once alongside the other JS files. If you're using the compiled (or minified) bootstrap.js, there is no need to include this—it's already there.

Use cases

A few examples of the transition plugin:

    @@ -123,7 +123,7 @@ $('#myModal').on('show.bs.modal', function (e) { - + {% highlight html %} @@ -142,7 +142,7 @@ $('#myModal').on('show.bs.modal', function (e) { - + {% endhighlight %} @@ -186,7 +186,7 @@ $('#myModal').on('show.bs.modal', function (e) { - +
    @@ -212,7 +212,7 @@ $('#myModal').on('show.bs.modal', function (e) { Save changes
    - + {% endhighlight %} @@ -264,7 +264,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 .modal-body. If you're using the data api, you may alternatively use the href tag 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 .modal-body. If you're using the data api, you may alternatively use the href tag to specify the remote source. An example of this is shown below:

    {% highlight html %} Click me {% endhighlight %} @@ -310,7 +310,7 @@ $('#myModal').modal({ shown - This event is fired when the modal has been made visible to the user (will wait for css transitions to complete). + This event is fired when the modal has been made visible to the user (will wait for CSS transitions to complete). hide @@ -318,7 +318,7 @@ $('#myModal').modal({ hidden - This event is fired when the modal has finished being hidden from the user (will wait for css transitions to complete). + This event is fired when the modal has finished being hidden from the user (will wait for CSS transitions to complete). @@ -773,13 +773,13 @@ $('#example').tooltip(options) animation boolean true - apply a css fade transition to the tooltip + apply a CSS fade transition to the tooltip html boolean false - 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. + 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. placement @@ -803,7 +803,7 @@ $('#example').tooltip(options) trigger string 'hover focus' - how tooltip is triggered - click | hover | focus | manual. Note you case pass trigger multiple, space seperated, trigger types. + how tooltip is triggered - click | hover | focus | manual. Note you case pass trigger multiple, space separated, trigger types. delay @@ -820,7 +820,7 @@ $('#example').tooltip(options) string | false false -

    Appends the tooltip to a specific element container: 'body'

    +

    Appends the tooltip to a specific element. Example: container: 'body'

    @@ -951,13 +951,13 @@ $('#example').tooltip(options) animation boolean true - apply a css fade transition to the tooltip + apply a CSS fade transition to the tooltip html boolean false - 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. + 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. placement @@ -1106,7 +1106,7 @@ $('#example').tooltip(options) closed - This event is fired when the alert has been closed (will wait for css transitions to complete). + This event is fired when the alert has been closed (will wait for CSS transitions to complete). @@ -1379,7 +1379,7 @@ $('.nav-tabs').button()

    Usage

    Via data attributes

    -

    Just add data-toggle="collapse" and a data-target to element to automatically assign control of a collapsible element. The data-target attribute accepts a css selector to apply the collapse to. Be sure to add the class collapse to the collapsible element. If you'd like it to default open, add the additional class in.

    +

    Just add data-toggle="collapse" and a data-target to element to automatically assign control of a collapsible element. The data-target attribute accepts a CSS selector to apply the collapse to. Be sure to add the class collapse to the collapsible element. If you'd like it to default open, add the additional class in.

    To add accordion-like group management to a collapsible control, add the data attribute data-parent="#selector". Refer to the demo to see this in action.

    Via JavaScript

    @@ -1451,7 +1451,7 @@ $('#myCollapsible').collapse({ shown - This event is fired when a collapse element has been made visible to the user (will wait for css transitions to complete). + This event is fired when a collapse element has been made visible to the user (will wait for CSS transitions to complete). hide @@ -1461,7 +1461,7 @@ $('#myCollapsible').collapse({ hidden - This event is fired when a collapse element has been hidden from the user (will wait for css transitions to complete). + This event is fired when a collapse element has been hidden from the user (will wait for CSS transitions to complete). -- cgit v1.2.3 From 242d92e09c60396bad0837581a9692bf7abe8aea Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Tue, 25 Jun 2013 20:18:30 -0700 Subject: Fix #8287 --- docs/javascript.html | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'docs/javascript.html') diff --git a/docs/javascript.html b/docs/javascript.html index 9a5a5b6f0..2580d9a6e 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -744,9 +744,10 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
- -

Tooltips in input groups

-

When using tooltips and popovers with the Bootstrap input groups, you'll have to set the container (documented below) option to avoid unwanted side effects.

+
+

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

+
@@ -873,6 +874,10 @@ $('#example').tooltip(options)

Plugin dependency

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

+
+

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

+

Static popover

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

@@ -1004,7 +1009,7 @@ $('#example').tooltip(options) string | false false -

Appends the popover to a specific element container: 'body'

+

Appends the popover to a specific element. Example: container: 'body'

-- cgit v1.2.3