fix(carousel): fix error with deleting multiple slides at once

angular-ui · Jun 24, 2013 · 3fcb70f · 3fcb70f
1 parent 6a4527b
commit 3fcb70f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/carousel/carousel.js b/src/carousel/carousel.js
@@ -159,6 +159,8 @@ angular.module('ui.bootstrap.carousel', ['ui.bootstrap.transition'])
       } else {
         self.select(slides[index]);
       }
+    } else if (currentIndex > index) {
+      currentIndex--;
     }
   };
 }])

diff --git a/src/carousel/test/carousel.spec.js b/src/carousel/test/carousel.spec.js
@@ -192,11 +192,13 @@ describe('carousel', function() {
     });    
 
     it('should remove slide from dom and change active slide', function() {
-      scope.$apply('slides[1].active = true');
-      testSlideActive(1);
-      scope.$apply('slides.splice(1,1)');
+      scope.$apply('slides[2].active = true');
+      testSlideActive(2);
+      scope.$apply('slides.splice(0,1)');
       expect(elm.find('div.item').length).toBe(2);
       testSlideActive(1);
+      $timeout.flush();
+      testSlideActive(0);
       scope.$apply('slides.splice(1,1)');
       expect(elm.find('div.item').length).toBe(1);
       testSlideActive(0);