aboutsummaryrefslogtreecommitdiff
path: root/docs/_includes
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2014-07-05 23:48:25 -0700
committerChris Rebert <[email protected]>2014-07-05 23:48:25 -0700
commit7933a50ee50e98c12caec7a4c197e92b9cd451be (patch)
treee7854bc78e7e301cf806deae943566327f30a912 /docs/_includes
parent22f851fa6232b2db2efedbabcc5b532e424525f3 (diff)
parent7f4af4aeeac5e93dcb69b5c820e8e791077cc787 (diff)
downloadbootstrap-7933a50ee50e98c12caec7a4c197e92b9cd451be.tar.xz
bootstrap-7933a50ee50e98c12caec7a4c197e92b9cd451be.zip
Merge pull request #14034 from twbs/deprecate-modal-remote
Deprecate the `remote` option of modals?
Diffstat (limited to 'docs/_includes')
-rw-r--r--docs/_includes/js/modal.html6
1 files changed, 4 insertions, 2 deletions
diff --git a/docs/_includes/js/modal.html b/docs/_includes/js/modal.html
index 9b8a70918..d5b1aee84 100644
--- a/docs/_includes/js/modal.html
+++ b/docs/_includes/js/modal.html
@@ -259,7 +259,9 @@
<td>remote</td>
<td>path</td>
<td>false</td>
- <td><p>If a remote URL is provided, <strong>content will be loaded one time</strong> via jQuery's <code>load</code> method and injected into the <code>.modal-content</code> div. If you're using the data-api, you may alternatively use the <code>href</code> attribute to specify the remote source. An example of this is shown below:</p>
+ <td>
+ <p><span class="text-danger">This option is deprecated since v3.2.1 and will be removed in v4.</span> We recommend instead using client-side templating or a data binding framework, or calling <a href="http://api.jquery.com/load/">jQuery.load</a> yourself.</p>
+ <p>If a remote URL is provided, <strong>content will be loaded one time</strong> via jQuery's <code>load</code> method and injected into the <code>.modal-content</code> div. If you're using the data-api, you may alternatively use the <code>href</code> attribute to specify the remote source. An example of this is shown below:</p>
{% highlight html %}
<a data-toggle="modal" href="remote.html" data-target="#modal">Click me</a>
{% endhighlight %}
@@ -320,7 +322,7 @@ $('#myModal').modal({
</tr>
<tr>
<td>loaded.bs.modal</td>
- <td>This event is fired when the modal has loaded content using the remote option.</td>
+ <td>This event is fired when the modal has loaded content using the <code>remote</code> option.</td>
</tr>
</tbody>
</table>