fix(scroll): rename 'scroll.resize' to 'scroll-resize' for jQuery's sake

Closes #3384.
ionic-team · Apr 15, 2015 · e19863c · e19863c
1 parent 4b75b73
commit e19863c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/js/angular/controller/scrollController.js b/js/angular/controller/scrollController.js
@@ -102,7 +102,7 @@ function($scope,
 
   self.resize = function() {
     return $timeout(resize, 0, false).then(function() {
-      $element && $element.triggerHandler('scroll.resize');
+      $element && $element.triggerHandler('scroll-resize');
     });
   };
 

diff --git a/js/angular/directive/collectionRepeat.js b/js/angular/directive/collectionRepeat.js
@@ -142,7 +142,7 @@ function CollectionRepeatDirective($ionicCollectionManager, $parse, $window, $$r
     initDimensions();
 
     // Dimensions are refreshed on resize or data change.
-    scrollCtrl.$element.on('scroll.resize', refreshDimensions);
+    scrollCtrl.$element.on('scroll-resize', refreshDimensions);
 
     angular.element($window).on('resize', onResize);
     var unlistenToExposeAside = $rootScope.$on('$ionicExposeAside', ionic.animationFrameThrottle(function() {
@@ -173,7 +173,7 @@ function CollectionRepeatDirective($ionicCollectionManager, $parse, $window, $$r
     scope.$on('$destroy', function() {
       angular.element($window).off('resize', onResize);
       unlistenToExposeAside();
-      scrollCtrl.$element && scrollCtrl.$element.off('scroll.resize', refreshDimensions);
+      scrollCtrl.$element && scrollCtrl.$element.off('scroll-resize', refreshDimensions);
 
       computedStyleNode && computedStyleNode.parentNode &&
         computedStyleNode.parentNode.removeChild(computedStyleNode);

diff --git a/test/unit/angular/directive/collectionRepeat.unit.js b/test/unit/angular/directive/collectionRepeat.unit.js
@@ -233,7 +233,7 @@ describe('collectionRepeat', function() {
       expect(activeItems().length).toEqual(3);
 
       scrollView.__clientHeight = 30;
-      scrollCtrl.$element.triggerHandler('scroll.resize');
+      scrollCtrl.$element.triggerHandler('scroll-resize');
       expect(activeItems().length).toEqual(2);
     }));
   });