rooty/Bootstrap
0
0
Fork 0
mirror of https://github.com/twbs/bootstrap.git synced 2025-02-21 18:54:30 +01:00
Code Issues Actions Packages Releases Activity

Merge branch 'master' of github.com:twbs/bootstrap

Browse Source
This commit is contained in:
Mark Otto 2013-12-08 17:19:45 -08:00
commit b98d6ed12b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
javascript.html
View File

@ -1433,14 +1433,14 @@ $('.btn').button()
<p>You can enable auto toggling of a button by using the <code>data-toggle</code> attribute.</p> <p>You can enable auto toggling of a button by using the <code>data-toggle</code> attribute.</p>
</div> </div>
{% highlight html %} {% highlight html %}
<button type="button" class="btn" data-toggle="button">...</button> <button type="button" class="btn btn-primary" data-toggle="button">...</button>
{% endhighlight %} {% endhighlight %}
<h4>$().button('loading')</h4> <h4>$().button('loading')</h4>
<p>Sets button state to loading - disables button and swaps text to loading text. Loading text should be defined on the button element using the data attribute <code>data-loading-text</code>. <p>Sets button state to loading - disables button and swaps text to loading text. Loading text should be defined on the button element using the data attribute <code>data-loading-text</code>.
</p> </p>
{% highlight html %} {% highlight html %}
<button type="button" class="btn" data-loading-text="loading stuff...">...</button> <button type="button" class="btn btn-primary" data-loading-text="loading stuff...">...</button>
{% endhighlight %} {% endhighlight %}
<div class="bs-callout bs-callout-danger"> <div class="bs-callout bs-callout-danger">
@ -1454,7 +1454,7 @@ $('.btn').button()
<h4>$().button(string)</h4> <h4>$().button(string)</h4>
<p>Resets button state - swaps text to any data defined text state.</p> <p>Resets button state - swaps text to any data defined text state.</p>
{% highlight html %} {% highlight html %}
<button type="button" class="btn" data-complete-text="finished!" >...</button> <button type="button" class="btn btn-primary" data-complete-text="finished!" >...</button>
<script> <script>
$('.btn').button('complete') $('.btn').button('complete')
</script> </script>