Commit 92c2ad98 authored by Jacob Thornton's avatar Jacob Thornton

fixes #8983

parent b8ed111a
...@@ -346,7 +346,7 @@ img { ...@@ -346,7 +346,7 @@ img {
} }
.img-circle { .img-circle {
border-radius: 500px; border-radius: 50%;
} }
hr { hr {
...@@ -4475,7 +4475,6 @@ a.list-group-item.active > .badge, ...@@ -4475,7 +4475,6 @@ a.list-group-item.active > .badge,
filter: alpha(opacity=90); filter: alpha(opacity=90);
} }
.carousel-control .glyphicon,
.carousel-control .icon-prev, .carousel-control .icon-prev,
.carousel-control .icon-next { .carousel-control .icon-next {
position: absolute; position: absolute;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -314,6 +314,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") } ...@@ -314,6 +314,7 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
Carousel.DEFAULTS = { Carousel.DEFAULTS = {
interval: 5000 interval: 5000
, pause: 'hover' , pause: 'hover'
, wrap: true
} }
Carousel.prototype.cycle = function (e) { Carousel.prototype.cycle = function (e) {
...@@ -378,12 +379,15 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") } ...@@ -378,12 +379,15 @@ if (!jQuery) { throw new Error("Bootstrap requires jQuery") }
var fallback = type == 'next' ? 'first' : 'last' var fallback = type == 'next' ? 'first' : 'last'
var that = this var that = this
if (!$next.length) {
if (!this.options.wrap) return
$next = this.$element.find('.item')[fallback]()
}
this.sliding = true this.sliding = true
isCycling && this.pause() isCycling && this.pause()
$next = $next.length ? $next : this.$element.find('.item')[fallback]()
var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction }) var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction })
if ($next.hasClass('active')) return if ($next.hasClass('active')) return
......
This diff is collapsed.
...@@ -1722,6 +1722,12 @@ $('.carousel').carousel() ...@@ -1722,6 +1722,12 @@ $('.carousel').carousel()
<td>"hover"</td> <td>"hover"</td>
<td>Pauses the cycling of the carousel on mouseenter and resumes the cycling of the carousel on mouseleave.</td> <td>Pauses the cycling of the carousel on mouseenter and resumes the cycling of the carousel on mouseleave.</td>
</tr> </tr>
<tr>
<td>wrap</td>
<td>boolean</td>
<td>true</td>
<td>Whether the carousel should cycle continuously or have hard stops.</td>
</tr>
</tbody> </tbody>
</table> </table>
</div><!-- /.bs-table-scrollable --> </div><!-- /.bs-table-scrollable -->
......
...@@ -41,6 +41,7 @@ ...@@ -41,6 +41,7 @@
Carousel.DEFAULTS = { Carousel.DEFAULTS = {
interval: 5000 interval: 5000
, pause: 'hover' , pause: 'hover'
, wrap: true
} }
Carousel.prototype.cycle = function (e) { Carousel.prototype.cycle = function (e) {
...@@ -105,12 +106,15 @@ ...@@ -105,12 +106,15 @@
var fallback = type == 'next' ? 'first' : 'last' var fallback = type == 'next' ? 'first' : 'last'
var that = this var that = this
if (!$next.length) {
if (!this.options.wrap) return
$next = this.$element.find('.item')[fallback]()
}
this.sliding = true this.sliding = true
isCycling && this.pause() isCycling && this.pause()
$next = $next.length ? $next : this.$element.find('.item')[fallback]()
var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction }) var e = $.Event('slide.bs.carousel', { relatedTarget: $next[0], direction: direction })
if ($next.hasClass('active')) return if ($next.hasClass('active')) return
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment