Merge branch 'raphaelz-patch-1' into 2.0.1-wip

Conflicts: docs/assets/bootstrap.zip
2012-02-06 23:36:31 -08:00 · 2012-02-06 23:36:31 -08:00 · 4ed1b13719
commit 4ed1b13719
parent 575b82473f 3722bb9a88
7 changed files with 24 additions and 10 deletions
--- 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>