From e19863c37cf168b11bd9c2737148d8a0248253fd Mon Sep 17 00:00:00 2001 From: Andrew Date: Wed, 15 Apr 2015 11:24:23 -0600 Subject: [PATCH] fix(scroll): rename 'scroll.resize' to 'scroll-resize' for jQuery's sake Closes #3384. --- js/angular/controller/scrollController.js | 2 +- js/angular/directive/collectionRepeat.js | 4 ++-- test/unit/angular/directive/collectionRepeat.unit.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/js/angular/controller/scrollController.js b/js/angular/controller/scrollController.js index 131c39487bb..37995ec3344 100644 --- 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 index 738e7d7e840..211c06ce213 100644 --- 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 index f850d9e5d0f..106e631437f 100644 --- 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); })); });