diff --git a/javascript.html b/javascript.html index 453be70ce9..eb9e5ced6c 100644 --- a/javascript.html +++ b/javascript.html @@ -15,7 +15,7 @@ base_url: "../"

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