mirrors/bootstrap
2
0
Fork 0
mirror of https://github.com/tenrok/bootstrap.git synced 2026-06-08 17:22:31 +03:00
Code Activity

Merge branch '2.1.2-wip' into box-sizing-exercise

Browse Source
This commit is contained in:
Mark Otto
2012-09-26 16:02:33 -07:00
parent cd5ae9e030 24e277b85a
commit ad96435d27
14 changed files with 32 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
docs/templates/pages/javascript.mustache
Vendored
+4 -4
View File
@@ -436,8 +436,8 @@ $('#myModal').on('hidden', function () {
<p><em>{{_i}}None{{/i}}</em></p>
<h3>{{_i}}Methods{{/i}}</h3>
<h4>$().dropdown()</h4>
<p>{{_i}}A programatic api for activating menus for a given navbar or tabbed navigation.{{/i}}</p>
<h4>$().dropdown('toggle')</h4>
<p>{{_i}}A programatic api for toggling menus for a given navbar or tabbed navigation.{{/i}}</p>
</section>
@@ -734,7 +734,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<tr>
<td>{{_i}}html{{/i}}</td>
<td>{{_i}}boolean{{/i}}</td>
<td>true</td>
<td>false</td>
<td>{{_i}}Insert html into the tooltip. If false, jquery's <code>text</code> method will be used to insert content into the dom. Use text if you're worried about XSS attacks.{{/i}}</td>
</tr>
<tr>
@@ -894,7 +894,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) {
<tr>
<td>{{_i}}html{{/i}}</td>
<td>{{_i}}boolean{{/i}}</td>
<td>true</td>
<td>false</td>
<td>{{_i}}Insert html into the popover. If false, jquery's <code>text</code> method will be used to insert content into the dom. Use text if you're worried about XSS attacks.{{/i}}</td>
</tr>
<tr>