From 4ec13704d27a0138a90a59e766ce72702c5491c0 Mon Sep 17 00:00:00 2001 From: kostyatretyak Date: Fri, 6 Dec 2013 02:03:35 +0200 Subject: Fixed another small error --- javascript.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'javascript.html') diff --git a/javascript.html b/javascript.html index dcc2a1e84..9557ca623 100644 --- a/javascript.html +++ b/javascript.html @@ -1941,7 +1941,7 @@ $('#myCarousel').on('slide.bs.carousel', function () {
  1. To start, the plugin adds .affix-top to indicate the element is in it's top-most position. At this point no CSS positioning is required.
  2. Scrolling past the element you want affixed should trigger the actual affixing. This is where .affix replaces .affix-top and sets position: fixed; (provided by Bootstrap's code CSS).
    3. -
  3. If a bottom offset is defined, scrolling past that should replace .affix with .affix-bottom. Since offsets are optional, setting one requires you to set the appropriate CSS. In this case, add position: absolute; when necessary. The plugin uses the data attribute or JavaScript option to determine where to position the elemtn from there.
    4. +
  4. If a bottom offset is defined, scrolling past that should replace .affix with .affix-bottom. Since offsets are optional, setting one requires you to set the appropriate CSS. In this case, add position: absolute; when necessary. The plugin uses the data attribute or JavaScript option to determine where to position the element from there.

Follow the above steps to set your CSS for either of the usage options below.

-- cgit v1.2.3 From dde53a56e0a5b1e9a8c66dcccf904fd422fe5b91 Mon Sep 17 00:00:00 2001 From: kostyatretyak Date: Fri, 6 Dec 2013 02:28:42 +0200 Subject: This is error? --- javascript.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'javascript.html') diff --git a/javascript.html b/javascript.html index 9557ca623..f0d50fcdd 100644 --- a/javascript.html +++ b/javascript.html @@ -1123,7 +1123,7 @@ $('#myTooltip').on('hidden.bs.tooltip', function () { animation boolean true - apply a CSS fade transition to the tooltip + apply a CSS fade transition to the popover html @@ -1141,7 +1141,7 @@ $('#myTooltip').on('hidden.bs.tooltip', function () { selector string false - 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 6145cc026d5344c61ea6b517b396f490dac5e90b Mon Sep 17 00:00:00 2001 From: kostyatretyak Date: Sun, 8 Dec 2013 09:11:43 +0200 Subject: Fixed some errors in the docs javascript.html --- javascript.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'javascript.html') diff --git a/javascript.html b/javascript.html index f0d50fcdd..71bbf6823 100644 --- a/javascript.html +++ b/javascript.html @@ -30,7 +30,7 @@ base_url: "../"

Data attributes

You can use all Bootstrap plugins purely through the markup API without writing a single line of JavaScript. This is Bootstrap's first-class API and should be your first consideration when using a plugin.

-

That said, in some situations it may be desirable to turn this functionality off. Therefore, we also provide the ability to disable the data attribute API by unbinding all events on the document namespaced with data-api. This looks like this: +

That said, in some situations it may be desirable to turn this functionality off. Therefore, we also provide the ability to disable the data attribute API by unbinding all events on the document namespaced with data-api. This looks like this:

{% highlight js %} $(document).off('.data-api') {% endhighlight %} @@ -50,7 +50,7 @@ $('.btn.danger').button('toggle').addClass('fat') {% highlight js %} $('#myModal').modal() // initialized with defaults $('#myModal').modal({ keyboard: false }) // initialized with no keyboard -$('#myModal').modal('show') // initializes and invokes show immediately

+$('#myModal').modal('show') // initializes and invokes show immediately {% endhighlight %}

Each plugin also exposes its raw constructor on a Constructor property: $.fn.popover.Constructor. If you'd like to get a particular plugin instance, retrieve it directly from an element: $('[rel=popover]').data('popover').

@@ -415,7 +415,7 @@ $('#myModal').on('hidden.bs.modal', function (e) { -

Within tabs

+

Within pills

- +
-- cgit v1.2.3 From 1f35b6ec5c3ff4801048e8a8c051d8af618e71de Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 8 Dec 2013 17:15:26 -0800 Subject: fix + {% 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 %}
@@ -1454,7 +1454,7 @@ $('.btn').button()

$().button(string)

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

{% highlight html %} - + -- cgit v1.2.3 From ae0d48057e7527640209aae0d60e484aa7552014 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 8 Dec 2013 17:42:59 -0800 Subject: fix #11787: document stateful button JS --- javascript.html | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) (limited to 'javascript.html') diff --git a/javascript.html b/javascript.html index 2ebb503e2..39dbc6e8e 100644 --- a/javascript.html +++ b/javascript.html @@ -1334,14 +1334,23 @@ $('#my-alert').bind('closed.bs.alert', function () {

Stateful

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

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

Single toggle

@@ -1440,7 +1449,16 @@ $('.btn').button()

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 %}
-- cgit v1.2.3 From d79431ca02683c9d1c754201260f66e5dda15614 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sat, 14 Dec 2013 16:29:55 -0800 Subject: Document new modal sizes --- javascript.html | 67 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 64 insertions(+), 3 deletions(-) (limited to 'javascript.html') diff --git a/javascript.html b/javascript.html index 39dbc6e8e..b693eaaf9 100644 --- a/javascript.html +++ b/javascript.html @@ -223,9 +223,9 @@ $('#myModal').on('show.bs.modal', function (e) {
-
- - + + + {% endhighlight %} @@ -235,6 +235,67 @@ $('#myModal').on('show.bs.modal', function (e) {

Additionally, you may give a description of your modal dialog with aria-describedby on .modal.

+

Optional sizes

+

Modals have two optional sizes, available via modifier classes to be placed on a .modal-dialog.

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

Usage

The modal plugin toggles your hidden content on demand, via data attributes or JavaScript. It also adds .model-open to the <body> to override default scrolling behavior and generates a .modal-backdrop to provide a click area for dismissing shown modals when clicking outside the modal.

-- cgit v1.2.3 From 1264cb714057188c743fad416ffaef35bc0b9d2d Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 15 Dec 2013 11:41:46 -0800 Subject: update tooltip docs --- javascript.html | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) (limited to 'javascript.html') diff --git a/javascript.html b/javascript.html index b693eaaf9..ee8324245 100644 --- a/javascript.html +++ b/javascript.html @@ -904,6 +904,12 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) { +{% highlight html %} + + + + +{% endhighlight %}

Opt-in functionality

@@ -926,9 +932,17 @@ $('#example').tooltip(options) {% endhighlight %}

Markup

-

The generated markup of a tooltip is rather simple, though it does require a position (by default, set to top by the plugin).

+

The required markup for a tooltip is only a data attribute and title on the HTML element you wish to have a tooltip. The generated markup of a tooltip is rather simple, though it does require a position (by default, set to top by the plugin).

+
+

Multiple-line links

+

Sometimes you want to add a tooltip to a hyperlink that wraps multiple lines. The default behavior of the tooltip plugin is to center it horizontally and vertically. Add white-space: nowrap; to your anchors to avoid this.

+
{% highlight html linenos %} -
+ +Hover over me + + +
Tooltip!
@@ -1011,11 +1025,6 @@ $('#example').tooltip(options)

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

-

Markup

-{% highlight html %} -Hover over me -{% endhighlight %} -

Methods

$().tooltip(options)

-- cgit v1.2.3 From cb3d9dfe8310a94a7b742ed62e088d64e93baba3 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 15 Dec 2013 11:44:16 -0800 Subject: Fixes #11833: add warning to docs for popover multiple line positioning; update it's docs with example markup, too --- javascript.html | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) (limited to 'javascript.html') diff --git a/javascript.html b/javascript.html index ee8324245..76c9807eb 100644 --- a/javascript.html +++ b/javascript.html @@ -906,8 +906,11 @@ $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
{% highlight html %} + + + {% endhighlight %} @@ -1170,6 +1173,29 @@ $('#myTooltip').on('hidden.bs.tooltip', function () {
+{% highlight html %} + + + + + + + +{% endhighlight %} + +
+

Multiple-line links

+

Sometimes you want to add a tooltip to a hyperlink that wraps multiple lines. The default behavior of the tooltip plugin is to center it horizontally and vertically. Add white-space: nowrap; to your anchors to avoid this.

+

Usage

-- cgit v1.2.3 From a925a0b985281ce34666c9a8a5630ba258904cb5 Mon Sep 17 00:00:00 2001 From: Mark Otto Date: Sun, 15 Dec 2013 12:27:46 -0800 Subject: Browser/device support docs update * Fixes #11055: add mention of select menu styling on Android stock browsers with included optional fix * Update IDs and docs nav to include bookmark links to each section * Add callout to navbar docs about fixed position, inputs, and virtual keyboard --- javascript.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'javascript.html') diff --git a/javascript.html b/javascript.html index 76c9807eb..d83358a39 100644 --- a/javascript.html +++ b/javascript.html @@ -74,7 +74,7 @@ $('#myModal').on('show.bs.modal', function (e) {

Third-party libraries

-

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.

+

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.

@@ -110,7 +110,7 @@ $('#myModal').on('show.bs.modal', function (e) {

Mobile device caveats

-

There are some caveats regarding using modals on mobile devices. See our browser support docs for details.

+

There are some caveats regarding using modals on mobile devices. See our browser support docs for details.

Static example

-- cgit v1.2.3