diff options
| author | Mark Otto <[email protected]> | 2012-02-05 01:26:44 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-02-05 01:26:44 -0800 |
| commit | 9b5b8460b4e6d5e30357aaddbef5425a6150b0bf (patch) | |
| tree | 84d7473e304829666cce645b3714b3fa37753262 /docs/templates/pages/javascript.mustache | |
| parent | 2f42f35c69da66709247c2830935479dc97061a4 (diff) | |
| parent | f922a0800b4ec46fe3aa1e31427308954e86940e (diff) | |
| download | bootstrap-9b5b8460b4e6d5e30357aaddbef5425a6150b0bf.tar.xz bootstrap-9b5b8460b4e6d5e30357aaddbef5425a6150b0bf.zip | |
Merge branch 'noahblon-master' into 2.0.1-wip
Conflicts:
docs/assets/bootstrap.zip
Diffstat (limited to 'docs/templates/pages/javascript.mustache')
| -rw-r--r-- | docs/templates/pages/javascript.mustache | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/templates/pages/javascript.mustache b/docs/templates/pages/javascript.mustache index 67bc83a1c..9850335c4 100644 --- a/docs/templates/pages/javascript.mustache +++ b/docs/templates/pages/javascript.mustache @@ -847,7 +847,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <hr> <h2>{{_i}}Using bootstrap-alerts.js{{/i}}</h2> <p>{{_i}}Enable dismissal of an alert via javascript:{{/i}}</p> - <pre class="prettyprint linenums">$(".alert-message").alert()</pre> + <pre class="prettyprint linenums">$(".alert").alert()</pre> <h3>{{_i}}Markup{{/i}}</h3> <p>{{_i}}Just add <code>data-dismiss="alert"</code> to your close button to automatically give an alert close functionality.{{/i}}</p> <pre class="prettyprint linenums"><a class="close" data-dismiss="alert" href="#">&times;</a></pre> @@ -856,7 +856,7 @@ $('a[data-toggle="tab"]').on('shown', function (e) { <p>{{_i}}Wraps all alerts with close functionality. To have your alerts animate out when closed, make sure they have the <code>.fade</code> and <code>.in</code> class already applied to them.{{/i}}</p> <h4>.alert('close')</h4> <p>{{_i}}Closes an alert.{{/i}}</p> - <pre class="prettyprint linenums">$(".alert-message").alert('close')</pre> + <pre class="prettyprint linenums">$(".alert").alert('close')</pre> <h3>{{_i}}Events{{/i}}</h3> <p>{{_i}}Bootstrap's alert class exposes a few events for hooking into alert functionality.{{/i}}</p> <table class="table table-bordered table-striped"> |
