Skip to content

Commit e19863c

Browse files
committed
fix(scroll): rename 'scroll.resize' to 'scroll-resize' for jQuery's sake
Closes #3384.
1 parent 4b75b73 commit e19863c

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Diff for: js/angular/controller/scrollController.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ function($scope,
102102

103103
self.resize = function() {
104104
return $timeout(resize, 0, false).then(function() {
105-
$element && $element.triggerHandler('scroll.resize');
105+
$element && $element.triggerHandler('scroll-resize');
106106
});
107107
};
108108

Diff for: js/angular/directive/collectionRepeat.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ function CollectionRepeatDirective($ionicCollectionManager, $parse, $window, $$r
142142
initDimensions();
143143

144144
// Dimensions are refreshed on resize or data change.
145-
scrollCtrl.$element.on('scroll.resize', refreshDimensions);
145+
scrollCtrl.$element.on('scroll-resize', refreshDimensions);
146146

147147
angular.element($window).on('resize', onResize);
148148
var unlistenToExposeAside = $rootScope.$on('$ionicExposeAside', ionic.animationFrameThrottle(function() {
@@ -173,7 +173,7 @@ function CollectionRepeatDirective($ionicCollectionManager, $parse, $window, $$r
173173
scope.$on('$destroy', function() {
174174
angular.element($window).off('resize', onResize);
175175
unlistenToExposeAside();
176-
scrollCtrl.$element && scrollCtrl.$element.off('scroll.resize', refreshDimensions);
176+
scrollCtrl.$element && scrollCtrl.$element.off('scroll-resize', refreshDimensions);
177177

178178
computedStyleNode && computedStyleNode.parentNode &&
179179
computedStyleNode.parentNode.removeChild(computedStyleNode);

Diff for: test/unit/angular/directive/collectionRepeat.unit.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ describe('collectionRepeat', function() {
233233
expect(activeItems().length).toEqual(3);
234234

235235
scrollView.__clientHeight = 30;
236-
scrollCtrl.$element.triggerHandler('scroll.resize');
236+
scrollCtrl.$element.triggerHandler('scroll-resize');
237237
expect(activeItems().length).toEqual(2);
238238
}));
239239
});

0 commit comments

Comments
 (0)