diff options
| author | Chris Rebert <[email protected]> | 2014-06-30 14:49:11 -0700 |
|---|---|---|
| committer | Chris Rebert <[email protected]> | 2014-06-30 14:49:11 -0700 |
| commit | 8deab3a95d24afa795c428572b7bfadbc7fb9ac5 (patch) | |
| tree | d97c44ccf4e6dd8cebef5fa6529277cf09f5ec8f /docs/_includes/js | |
| parent | 2ff0e5efa25b6e89ebf07d84a19467181fe89adc (diff) | |
| parent | 3dfad4f1addd50a066d28ca605f14d4dc9a2b82f (diff) | |
| download | bootstrap-8deab3a95d24afa795c428572b7bfadbc7fb9ac5.tar.xz bootstrap-8deab3a95d24afa795c428572b7bfadbc7fb9ac5.zip | |
Merge pull request #13988 from twbs/fix-13896
doc that you can't use both data-ride and $().carousel() on the same carousel
Diffstat (limited to 'docs/_includes/js')
| -rw-r--r-- | docs/_includes/js/carousel.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/_includes/js/carousel.html b/docs/_includes/js/carousel.html index b8a0d1e4b..222caf333 100644 --- a/docs/_includes/js/carousel.html +++ b/docs/_includes/js/carousel.html @@ -132,7 +132,7 @@ <h3>Via data attributes</h3> <p>Use data attributes to easily control the position of the carousel. <code>data-slide</code> accepts the keywords <code>prev</code> or <code>next</code>, which alters the slide position relative to its current position. Alternatively, use <code>data-slide-to</code> to pass a raw slide index to the carousel <code>data-slide-to="2"</code>, which shifts the slide position to a particular index beginning with <code>0</code>.</p> - <p>The <code>data-ride="carousel"</code> attribute is used to mark a carousel as animating starting at page load.</p> + <p>The <code>data-ride="carousel"</code> attribute is used to mark a carousel as animating starting at page load. <strong class="text-danger">It cannot be used in combination with (redundant and unnecessary) explicit JavaScript initialization of the same carousel.</strong></p> <h3>Via JavaScript</h3> <p>Call carousel manually with:</p> |