aboutsummaryrefslogtreecommitdiff
path: root/docs/javascript.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-02-06 23:36:31 -0800
committerMark Otto <[email protected]>2012-02-06 23:36:31 -0800
commit4ed1b13719083fb9bb7ab7273cc9bf84482992cc (patch)
treefd67d1ffb5e9edfc549b5d21e389a9729e4f00ba /docs/javascript.html
parent575b82473f8d248ca3782fa86ce1c92eea03905c (diff)
parent3722bb9a88e95b37ded12cb40a67ac396ce140fd (diff)
downloadbootstrap-4ed1b13719083fb9bb7ab7273cc9bf84482992cc.tar.xz
bootstrap-4ed1b13719083fb9bb7ab7273cc9bf84482992cc.zip
Merge branch 'raphaelz-patch-1' into 2.0.1-wip
Conflicts: docs/assets/bootstrap.zip
Diffstat (limited to 'docs/javascript.html')
-rw-r--r--docs/javascript.html6
1 files changed, 6 insertions, 0 deletions
diff --git a/docs/javascript.html b/docs/javascript.html
index b6abe80ea..02467051d 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -273,6 +273,12 @@
<td>true</td>
<td>Closes the modal when escape key is pressed</td>
</tr>
+ <tr>
+ <td>show</td>
+ <td>boolean</td>
+ <td>true</td>
+ <td>Shows the modal when initialized.</td>
+ </tr>
</tbody>
</table>
<h3>Markup</h3>