diff options
| author | Chris Rebert <[email protected]> | 2014-02-28 11:42:11 -0800 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-02-28 11:42:11 -0800 |
| commit | b3e3025f8f05ad9fd43dab6dbef6bc30cfdab22b (patch) | |
| tree | 7f30ea64844ae41f0a6bd112bc03a6af34e87e49 /docs | |
| parent | 299f985e5d453c2a6b1202bbc545d83f84b09360 (diff) | |
| parent | 7d1fd44b9a9a998850533c1023667e2ee6cb1ad0 (diff) | |
| download | bootstrap-b3e3025f8f05ad9fd43dab6dbef6bc30cfdab22b.tar.xz bootstrap-b3e3025f8f05ad9fd43dab6dbef6bc30cfdab22b.zip | |
Merge pull request #12880 from hnrch02/patch-1
Fix small typo in JavaScript docs
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/javascript.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/javascript.html b/docs/javascript.html index cc125d832..bf5944fcb 100644 --- a/docs/javascript.html +++ b/docs/javascript.html @@ -65,7 +65,7 @@ $.fn.bootstrapBtn = bootstrapButton // give $().bootstrapBtn the Boot {% endhighlight %} <h3 id="js-events">Events</h3> - <p>Bootstrap provides custom events for most plugins' unique actions. Generally, these come in an infinitive and past participle form - where the infinitive (ex. <code>show</code>) is triggered at the start of an event, and its past participle form (ex. <code>shown</code>) is trigger on the completion of an action.</p> + <p>Bootstrap provides custom events for most plugins' unique actions. Generally, these come in an infinitive and past participle form - where the infinitive (ex. <code>show</code>) is triggered at the start of an event, and its past participle form (ex. <code>shown</code>) is triggered on the completion of an action.</p> <p>As of 3.0.0, all Bootstrap events are namespaced.</p> <p>All infinitive events provide <code>preventDefault</code> functionality. This provides the ability to stop the execution of an action before it starts.</p> {% highlight js %} |
