aboutsummaryrefslogtreecommitdiff
path: root/docs/javascript.html
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2012-06-04 08:33:48 -0700
committerMark Otto <[email protected]>2012-06-04 08:33:48 -0700
commit37ba0eba024944ab13d2fd093d3e12340430fecd (patch)
tree4af1a53c0384f3c2cc01fc8522a1f18841fc0719 /docs/javascript.html
parenteb3a4b8f759299e4157bd32deb6016587f48acb4 (diff)
parent82ea5847a7188b2798c5dbb0792e53ee8f60db55 (diff)
downloadbootstrap-37ba0eba024944ab13d2fd093d3e12340430fecd.tar.xz
bootstrap-37ba0eba024944ab13d2fd093d3e12340430fecd.zip
Merge branch '2.1.0-wip' of github.com:twitter/bootstrap into 2.1.0-wip
Diffstat (limited to 'docs/javascript.html')
-rw-r--r--docs/javascript.html7
1 files changed, 7 insertions, 0 deletions
diff --git a/docs/javascript.html b/docs/javascript.html
index 8104219c4..a60d45316 100644
--- a/docs/javascript.html
+++ b/docs/javascript.html
@@ -269,6 +269,13 @@
<td>true</td>
<td>Shows the modal when initialized.</td>
</tr>
+ <tr>
+ <td>remote</td>
+ <td>path</td>
+ <td>false</td>
+ <td><p>If a remote url is provided, content will be loaded via jQuery's <code>load</code> method and injected into the <code>.modal-body</code>. If you're using the data api, you may alternatively use the <code>href</code> tag to specify the remote source. An example of this is shown below:</p>
+<pre class="prettyprint linenums"><code>&lt;a data-toggle="modal" href="remote.html" data-target="#modal"&gt;click me&lt;/a&gt;</code></pre></td>
+ </tr>
</tbody>
</table>
<h3>Markup</h3>