From ddadb2cf659745e6261912fdf64f3c00c0a8b400 Mon Sep 17 00:00:00 2001 From: Heinrich Fenkart Date: Wed, 6 Aug 2014 01:59:13 +0200 Subject: Document that alerts are removed from the DOM when closed; fixes #14318 --- docs/_includes/js/alerts.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/js/alerts.html b/docs/_includes/js/alerts.html index 2f6b33368..9b29b4c2a 100644 --- a/docs/_includes/js/alerts.html +++ b/docs/_includes/js/alerts.html @@ -23,7 +23,7 @@

Usage

-

Just add data-dismiss="alert" to your close button to automatically give an alert close functionality.

+

Just add data-dismiss="alert" to your close button to automatically give an alert close functionality. Closing an alert removes it from the DOM.

{% highlight html %} {% endhighlight %} -

To have your alerts use animation when closing, make sure they have the .fade and .in class already applied to them.

+

To have your alerts use animation when closing, make sure they have the .fade and .in classes already applied to them.

Methods

@@ -40,7 +40,7 @@

Makes an alert listen for click events on descendant elements which have the data-dismiss="alert" attribute. (Not necessary when using the data-api's auto-initialization.)

$().alert('close')

-

Closes an alert.

+

Closes an alert by removing it from the DOM. If the .fade and .in classes are present on the element, the alert will fade out before it is removed.

Events

-- cgit v1.2.3 From d9f1ea8252933d7c6234b63a3dcb646849a13833 Mon Sep 17 00:00:00 2001 From: Heinrich Fenkart Date: Tue, 5 Aug 2014 11:32:24 +0200 Subject: Small wording tweak in alert docs --- docs/_includes/js/alerts.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/_includes') diff --git a/docs/_includes/js/alerts.html b/docs/_includes/js/alerts.html index 9b29b4c2a..e9a3120de 100644 --- a/docs/_includes/js/alerts.html +++ b/docs/_includes/js/alerts.html @@ -44,7 +44,7 @@

Events

-

Bootstrap's alert class exposes a few events for hooking into alert functionality.

+

Bootstrap's alert plugin exposes a few events for hooking into alert functionality.

-- cgit v1.2.3 From 2c625c7d1a82147ac81c3038cdfd84c5a34d97d9 Mon Sep 17 00:00:00 2001 From: Heinrich Fenkart Date: Tue, 5 Aug 2014 12:56:33 +0200 Subject: Clean up buttons documentation --- docs/_includes/js/buttons.html | 145 ++++++++++++++----------------------- docs/_includes/nav/javascript.html | 6 +- 2 files changed, 59 insertions(+), 92 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/js/buttons.html b/docs/_includes/js/buttons.html index a8f2ffc26..f07e716c8 100644 --- a/docs/_includes/js/buttons.html +++ b/docs/_includes/js/buttons.html @@ -1,169 +1,134 @@

Buttons button.js

-

Example uses

-

Do more with buttons. Control button states or create groups of buttons for more components like toolbars.

+

Do more with buttons. Control button states or create groups of buttons for more components like toolbars.

-

Stateful

+
+

Cross-browser compatibility

+

Firefox persists form control states (disabledness and checkedness) across page loads. A workaround for this is to use autocomplete="off".

+
+ +

Stateful

Add data-loading-text="Loading..." to use a loading state on a button.

-
-
{% highlight html %} - + {% endhighlight %} -

Single toggle

+

Single toggle

Add data-toggle="button" to activate toggling on a single button.

-
- +
+
{% highlight html %} - + {% endhighlight %} -

Checkbox

-

Add data-toggle="buttons" to a group of checkboxes for checkbox style toggling on btn-group.

+

Checkbox / Radio

+

Add data-toggle="buttons" to a .btn-group containing checkbox or radio inputs to enable toggling in their respective styles.

-

Pre-checked options need .active

-

For pre-checked options, you must add the .active class to the input's label yourself.

+

Preselected options need .active

+

For preselected options, you must add the .active class to the input's label yourself.

Visual checked state only updated on click

If the checked state of a checkbox button is updated without firing a click event on the button (e.g. via <input type="reset"> or via setting the checked property of the input), you will need to toggle the .active class on the input's label yourself.

-
+
{% highlight html %}
{% endhighlight %} -

Radio

-

Add data-toggle="buttons" to a group of radio inputs for radio style toggling on btn-group.

-
-

Preselected options need .active

-

For preselected options, you must add the .active class to the input's label yourself.

-
-
-

Visual checked state only updated on click

-

If the checked state of a radio button is updated without firing a click event on the button (e.g. via <input type="reset"> or via setting the checked property of the input), you will need to toggle the .active class on the input's label yourself.

-
-
+
{% highlight html %}
{% endhighlight %} - -

Usage

-

Enable buttons via JavaScript:

-{% highlight js %} -$('.btn').button() -{% endhighlight %} - -

Markup

-

Data attributes are integral to the button plugin. Check out the example code below for the various markup types.

- -

Options

-

None

- -

Methods

+

Methods

$().button('toggle')

Toggles push state. Gives the button the appearance that it has been activated.

-
-

Auto toggling

-

You can enable auto toggling of a button by using the data-toggle attribute.

-
-{% highlight html %} - -{% endhighlight %} - -

$().button('loading')

-

Sets button state to loading - disables button and swaps text to loading text. Loading text should be defined on the button element using the data attribute data-loading-text. -

-{% highlight html %} - - -{% endhighlight %} - -
-

Cross-browser compatibility

-

Firefox persists form control states (disabledness and checkedness) across page loads. A workaround for this is to use autocomplete="off".

-

$().button('reset')

Resets button state - swaps text to original text.

$().button(string)

-

Resets button state - swaps text to any data defined text state.

+

Swaps text to any data defined text state.

{% highlight html %} - + + {% endhighlight %}
diff --git a/docs/_includes/nav/javascript.html b/docs/_includes/nav/javascript.html index bab188ef1..3459bb1e4 100644 --- a/docs/_includes/nav/javascript.html +++ b/docs/_includes/nav/javascript.html @@ -65,8 +65,10 @@
  • Button
  • -- cgit v1.2.3 From 4fc96e802950cb7fe9aa0580203992f2c467afe5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 23 Aug 2014 13:35:22 -0700 Subject: grunt --- docs/_includes/customizer-variables.html | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'docs/_includes') diff --git a/docs/_includes/customizer-variables.html b/docs/_includes/customizer-variables.html index ab47463be..095482e05 100644 --- a/docs/_includes/customizer-variables.html +++ b/docs/_includes/customizer-variables.html @@ -730,7 +730,7 @@
    • - +
    @@ -742,7 +742,7 @@
    - +
    @@ -813,10 +813,6 @@
    -
    - - -

    Tabs

    -- cgit v1.2.3 From 28c907f635bf4f3413c5ae641773b0cf38e80672 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 23 Aug 2014 13:35:39 -0700 Subject: fixes #14441 --- docs/_includes/js/carousel.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/_includes') diff --git a/docs/_includes/js/carousel.html b/docs/_includes/js/carousel.html index 728356268..23f9af97a 100644 --- a/docs/_includes/js/carousel.html +++ b/docs/_includes/js/carousel.html @@ -1,8 +1,9 @@

    Carousel carousel.js

    +

    A slideshow component for cycling through elemnts, like a carousel. Nested carousels are not supported.

    + -

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

    - +

    Popover arrow color

    -- cgit v1.2.3 From 72ddad6fc88fc7ee9ff99556f1aa64b21539bd03 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Wed, 27 Aug 2014 23:33:03 -0700 Subject: Fixes #14439: Add static tooltip example to docs --- docs/_includes/js/tooltips.html | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'docs/_includes') diff --git a/docs/_includes/js/tooltips.html b/docs/_includes/js/tooltips.html index 127e10155..2165dddc7 100644 --- a/docs/_includes/js/tooltips.html +++ b/docs/_includes/js/tooltips.html @@ -10,6 +10,35 @@

    +

    Static tooltip

    +

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

    +
    + + + + +
    +

    Four directions

    -- cgit v1.2.3 From 629fe6329185460f29e684f9fd8679fcb60da3cd Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Thu, 28 Aug 2014 19:55:23 -0700 Subject: Document that input groups weren't intended for use with