Skip to content
This repository was archived by the owner on May 29, 2019. It is now read-only.

Commit 8056368

Browse files
committed
fix(carousel): fix sorting of indicators
- Change the `orderBy` usage to `indexOfSlide` to properly order indicators Closes #4071 Fixes #3764
1 parent ff37fb6 commit 8056368

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/carousel/carousel.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ angular.module('ui.bootstrap.carousel', [])
2020
var destroyed = false;
2121
/* direction: "prev" or "next" */
2222
self.select = $scope.select = function(nextSlide, direction) {
23-
var nextIndex = self.indexOfSlide(nextSlide);
23+
var nextIndex = $scope.indexOfSlide(nextSlide);
2424
//Decide direction if it's not given
2525
if (direction === undefined) {
2626
direction = nextIndex > self.getCurrentIndex() ? 'next' : 'prev';
@@ -86,7 +86,7 @@ angular.module('ui.bootstrap.carousel', [])
8686
};
8787

8888
/* Allow outside people to call indexOf on slides array */
89-
self.indexOfSlide = function(slide) {
89+
$scope.indexOfSlide = function(slide) {
9090
return angular.isDefined(slide.index) ? +slide.index : slides.indexOf(slide);
9191
};
9292

template/carousel/carousel.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div ng-mouseenter="pause()" ng-mouseleave="play()" class="carousel" ng-swipe-right="prev()" ng-swipe-left="next()">
22
<ol class="carousel-indicators" ng-show="slides.length > 1">
3-
<li ng-repeat="slide in slides | orderBy:'index' track by $index" ng-class="{active: isActive(slide)}" ng-click="select(slide)"></li>
3+
<li ng-repeat="slide in slides | orderBy:indexOfSlide track by $index" ng-class="{active: isActive(slide)}" ng-click="select(slide)"></li>
44
</ol>
55
<div class="carousel-inner" ng-transclude></div>
66
<a class="left carousel-control" ng-click="prev()" ng-show="slides.length > 1"><span class="glyphicon glyphicon-chevron-left"></span></a>

0 commit comments

Comments
 (0)