javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(ionInfiniteScroll): remove listener on $destroy

Browse Source
This commit is contained in:
Andy Joslin
2014-04-09 08:32:24 -06:00
parent d58fff72de
commit 08da6f753c
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
js/ext/angular/src/directive/ionicContent.js vendored
View File

@@ -353,9 +353,15 @@ function($timeout, $controller, $ionicBind) {
}, 0, false);
infiniteScrollCtrl.isLoading = false;
});
$scope.$on('$destroy', function() {
scrollCtrl.$element.off('scroll', checkBounds);
});
scrollCtrl.$element.on('scroll', ionic.animationFrameThrottle(checkInfiniteBounds));
setTimeout(checkInfiniteBounds);
var checkBounds = ionic.animationFrameThrottle(checkInfiniteBounds);
//Check bounds on start, after scrollView is fully rendered
setTimeout(checkBounds);
scrollCtrl.$element.on('scroll', checkBounds);
function checkInfiniteBounds() {
if (infiniteScrollCtrl.isLoading) return;

8
js/ext/angular/test/directive/ionicInfiniteScroll.unit.js
View File

@@ -61,6 +61,14 @@ describe('ionicInfiniteScroll directive', function() {
expect(ctrl.isLoading).toBe(false);
});
it('should unbind scroll event on destroy', function() {
var el = setup();
spyOn(el.controller('$ionicScroll').$element, 'off');
el.scope().$destroy();
expect(el.controller('$ionicScroll').$element.off).toHaveBeenCalledWith('scroll', jasmine.any(Function));
});
describe('icon', function() {
it('should have default icon ion-loading-d', function() {
var el = setup();