mirror_css/bootstrap
1
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-26 05:19:15 +02:00
Code Issues Releases Wiki Activity

Merge branch '2.2.2-wip' into exploratory

Browse Source 
Conflicts:
	docs/assets/css/bootstrap.css
	docs/scaffolding.html
	docs/templates/pages/scaffolding.mustache
This commit is contained in:
Mark Otto
2012-11-03 13:44:01 -07:00
parent 1477e081d4 5d6cf2ee19
commit a249d1c8ee
16 changed files with 164 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docs/javascript.html
View File

@@ -134,7 +134,7 @@ $("#myModal").modal('show') // initializes and invokes show immed
<h3>Events</h3>
<p>Bootstrap provides custom events for most plugin's 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>All infinitive events provide preventDefault functionality. This provides the abililty to stop the execution of an action before it starts.</p>
<p>All infinitive events provide preventDefault functionality. This provides the ability to stop the execution of an action before it starts.</p>
<pre class="prettyprint linenums">
$('#myModal').on('show', function (e) {
if (!data) return e.preventDefault() // stops modal from being shown
@@ -505,7 +505,7 @@ $('#myModal').on('hidden', function () {
<h3>Methods</h3>
<h4>$().dropdown('toggle')</h4>
<p>A programatic api for toggling menus for a given navbar or tabbed navigation.</p>
<p>A programmatic api for toggling menus for a given navbar or tabbed navigation.</p>
</section>
@@ -634,7 +634,7 @@ $('[data-spy="scroll"]').each(function () {
<h2>Example tabs</h2>
<p>Add quick, dynamic tab functionality to transiton through panes of local content, even via dropdown menus.</p>
<p>Add quick, dynamic tab functionality to transition through panes of local content, even via dropdown menus.</p>
<div class="bs-docs-example">
<ul id="myTab" class="nav nav-tabs">
<li class="active"><a href="#home" data-toggle="tab">Home</a></li>