From 3a96ff9a0a9c1eac4d19fb708e1901cc81d2d9df Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 3 Aug 2013 02:21:29 -0700 Subject: JS docs: fix caps of "CSS" acronym --- javascript.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'javascript.html') diff --git a/javascript.html b/javascript.html index 2dbf76fd4..14dd49198 100644 --- a/javascript.html +++ b/javascript.html @@ -89,7 +89,7 @@ $('#myModal').on('show.bs.modal', function (e) {

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.

What's inside

-

Transition.js is a basic helper for transitionEnd events as well as a css transition emulator. It's used by the other plugins to check for css transition support and to catch hanging transitions.

+

Transition.js is a basic helper for transitionEnd events as well as a CSS transition emulator. It's used by the other plugins to check for CSS transition support and to catch hanging transitions.

-- cgit v1.2.3 From 364fdf7fa12c962600271d07c0cafd67d78c2e51 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 3 Aug 2013 02:22:55 -0700 Subject: JavaScript docs: fix caps of "JS" --- javascript.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'javascript.html') diff --git a/javascript.html b/javascript.html index 14dd49198..945a46597 100644 --- a/javascript.html +++ b/javascript.html @@ -1794,7 +1794,7 @@ $('#myCarousel').on('slide.bs.carousel', function () {

Requires independent styling ;)

Affix toggles between three states/classes: affix, affix-top, and affix-bottom. You must provide the styles for these classes yourself (independent of this plugin). - The affix-top class should be in the regular flow of the document. The affix class should be fixed to the page. And affix-bottom should be positioned absolute. Note, affix-bottom is special in that the plugin will place the element with js relative to the offset: { bottom: number } option you've provided. + The affix-top class should be in the regular flow of the document. The affix class should be fixed to the page. And affix-bottom should be positioned absolute. Note, affix-bottom is special in that the plugin will place the element with JS relative to the offset: { bottom: number } option you've provided.

-- cgit v1.2.3 From fce2e89b7d772fcac3bf49117f203ec32c751dfe Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 3 Aug 2013 02:24:31 -0700 Subject: JS docs: put `transitionEnd` within --- javascript.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'javascript.html') diff --git a/javascript.html b/javascript.html index 945a46597..af1cd199b 100644 --- a/javascript.html +++ b/javascript.html @@ -89,7 +89,7 @@ $('#myModal').on('show.bs.modal', function (e) {

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.

What's inside

-

Transition.js is a basic helper for transitionEnd events as well as a CSS transition emulator. It's used by the other plugins to check for CSS transition support and to catch hanging transitions.

+

Transition.js is a basic helper for transitionEnd events as well as a CSS transition emulator. It's used by the other plugins to check for CSS transition support and to catch hanging transitions.

-- cgit v1.2.3 From 23ef8c0c209844dd8b92d2a5ac82daffa7bd2914 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 3 Aug 2013 21:39:57 -0700 Subject: Greater standardization of sizing terminology In class names: * large => lg * small => sm * mini => xs ("Extra small") In screen size categories: * Tiny => Extra small --- javascript.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'javascript.html') diff --git a/javascript.html b/javascript.html index af1cd199b..453be70ce 100644 --- a/javascript.html +++ b/javascript.html @@ -189,11 +189,11 @@ $('#myModal').on('show.bs.modal', function (e) {
- Launch demo modal + Launch demo modal
{% highlight html %} - Launch demo modal + Launch demo modal

Individual or compiled

-

Plugins can be included individually (using bootstrap's individual *.js files, or all at once (using bootstrap.js or the minified bootstrap.min.js.

+

Plugins can be included individually (using Bootstrap's individual *.js files, or all at once (using bootstrap.js or the minified bootstrap.min.js.

Do not attempt to include both.

@@ -59,12 +59,12 @@ $("#myModal").modal('show') // initializes and invokes show immed

Sometimes it is necessary to use Bootstrap plugins with other UI frameworks. In these circumstances, namespace collisions can occasionally occur. If this happens, you may call .noConflict on the plugin you wish to revert the value of.

{% highlight js %} var bootstrapButton = $.fn.button.noConflict() // return $.fn.button to previously assigned value -$.fn.bootstrapBtn = bootstrapButton // give $().bootstrapBtn the bootstrap functionality +$.fn.bootstrapBtn = bootstrapButton // give $().bootstrapBtn the Bootstrap functionality {% endhighlight %}

Events

Bootstrap provides custom events for most plugin's unique actions. Generally, these come in an infinitive and past participle form - where the infinitive (ex. show) is triggered at the start of an event, and its past participle form (ex. shown) is trigger on the completion of an action.

-

As of 3.0.0, all bootstrap events are namespaced.

+

As of 3.0.0, all Bootstrap events are namespaced.

All infinitive events provide preventDefault functionality. This provides the ability to stop the execution of an action before it starts.

{% highlight js %} $('#myModal').on('show.bs.modal', function (e) { -- cgit v1.2.3 From 899c147cd561a4fd8757cb76124036e5a73c5c92 Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sat, 3 Aug 2013 23:16:09 -0700 Subject: streamline $().dropdown('toggle') description --- javascript.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'javascript.html') diff --git a/javascript.html b/javascript.html index eb9e5ced6..ff1aced13 100644 --- a/javascript.html +++ b/javascript.html @@ -465,7 +465,7 @@ $('.dropdown-toggle').dropdown()

Methods

$().dropdown('toggle')

-

A programmatic api for toggling menus for a given navbar or tabbed navigation.

+

Toggles the dropdown menu of a given navbar or tabbed navigation.

-- cgit v1.2.3 From b6390d298aa71e6dccb10e539097fbc7aaa45b8a Mon Sep 17 00:00:00 2001 From: Chris Rebert Date: Sun, 4 Aug 2013 00:06:56 -0700 Subject: trivial docs grammar improvements --- javascript.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'javascript.html') diff --git a/javascript.html b/javascript.html index ff1aced13..f7102f93f 100644 --- a/javascript.html +++ b/javascript.html @@ -28,7 +28,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.

+

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: {% highlight js %} -- cgit v1.2.3