aboutsummaryrefslogtreecommitdiff
path: root/docs/_includes
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2015-05-05 15:38:45 -0700
committerChris Rebert <[email protected]>2015-05-05 15:38:45 -0700
commitd9a7cb2a09b889e324273739d2ec46eb8e2be75b (patch)
tree90c4b100225fc7d3d35653f7c283b275c2dc82a9 /docs/_includes
parent414d0a535a514ab9458e12830cc76905582f0851 (diff)
parent89f2c5c5c04022e2e6381d361c66395d99c570d5 (diff)
downloadbootstrap-d9a7cb2a09b889e324273739d2ec46eb8e2be75b.tar.xz
bootstrap-d9a7cb2a09b889e324273739d2ec46eb8e2be75b.zip
Merge pull request #16430 from twbs/stateful-btn
Improvements to stateful button JS docs
Diffstat (limited to 'docs/_includes')
-rw-r--r--docs/_includes/js/buttons.html3
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/_includes/js/buttons.html b/docs/_includes/js/buttons.html
index 827906cd8..55009dee2 100644
--- a/docs/_includes/js/buttons.html
+++ b/docs/_includes/js/buttons.html
@@ -10,6 +10,7 @@
<h2 id="buttons-stateful">Stateful</h2>
<p>Add <code>data-loading-text="Loading..."</code> to use a loading state on a button.</p>
+ <p><strong class="text-danger">This feature is deprecated since v3.3.5 and will be removed in v4.</strong></p>
<div class="bs-callout bs-callout-info" id="callout-buttons-state-names">
<h4>Use whichever state you like!</h4>
<p>For the sake of this demonstration, we are using <code>data-loading-text</code> and <code>$().button('loading')</code>, but that's not the only state you can use. <a href="#buttons-methods">See more on this below in the <code>$().button(string)</code> documentation</a>.</p>
@@ -119,7 +120,7 @@
<p>Toggles push state. Gives the button the appearance that it has been activated.</p>
<h4><code>$().button('reset')</code></h4>
- <p>Resets button state - swaps text to original text.</p>
+ <p>Resets button state - swaps text to original text. <strong>This method is asynchronous and returns before the resetting has actually completed.</strong></p>
<h4><code>$().button(string)</code></h4>
<p>Swaps text to any data defined text state.</p>