Merge pull request #3842 from labrute974/patch-1

fix(slidebox): removing an item breaks slidebox
ionic-team · Dec 6, 2015 · 7199e09 · 7199e09
2 parents 889ea34 + f3a8537
commit 7199e09
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/js/angular/directive/slideBox.js b/js/angular/directive/slideBox.js
@@ -37,12 +37,13 @@
  */
 IonicModule
 .directive('ionSlideBox', [
+  '$animate',
   '$timeout',
   '$compile',
   '$ionicSlideBoxDelegate',
   '$ionicHistory',
   '$ionicScrollDelegate',
-function($timeout, $compile, $ionicSlideBoxDelegate, $ionicHistory, $ionicScrollDelegate) {
+function($animate, $timeout, $compile, $ionicSlideBoxDelegate, $ionicHistory, $ionicScrollDelegate) {
   return {
     restrict: 'E',
     replace: true,
@@ -155,6 +156,9 @@ function($timeout, $compile, $ionicSlideBoxDelegate, $ionicHistory, $ionicScroll
     '</div>',
 
     link: function($scope, $element, $attr) {
+      // Disable ngAnimate for slidebox and its children
+      $animate.enabled(false, $element);
+
       // if showPager is undefined, show the pager
       if (!isDefined($attr.showPager)) {
         $scope.showPager = true;