fix(scroll): cleanup native scroll listeners only if activated

ionic-team · Feb 13, 2015 · df6dcb9 · df6dcb9
1 parent be09433
commit df6dcb9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/js/angular/controller/refresherController.js b/js/angular/controller/refresherController.js
@@ -246,14 +246,14 @@ IonicModule
       ionic.on('touchmove', handleTouchmove, scrollChild);
       ionic.on('touchend', handleTouchend, scrollChild);
       ionic.on('scroll', handleScroll, scrollParent);
-    };
-
 
-    $scope.$on('$destroy', destroy);
+      // cleanup when done
+      $scope.$on('$destroy', destroy);
+    };
 
     function destroy() {
-      ionic.off('dragdown', handleTouchmove, scrollChild);
-      ionic.off('dragend', handleTouchend, scrollChild);
+      ionic.off('touchmove', handleTouchmove, scrollChild);
+      ionic.off('touchend', handleTouchend, scrollChild);
       ionic.off('scroll', handleScroll, scrollParent);
       scrollParent = null;
       scrollChild = null;

diff --git a/test/unit/angular/controller/refreshController.unit.js b/test/unit/angular/controller/refreshController.unit.js
@@ -126,4 +126,16 @@ describe('$ionicRefresh Controller', function() {
     ctrl.getRefresherDomMethods().hide();
     expect(refresher.classList.contains('invisible')).toBe(true);
   });
+
+  it('should cleanup when done', function() {
+    setup();
+
+    expect(ctrl.__getScrollChild()).not.toBe(null);
+    expect(ctrl.__getScrollParent()).not.toBe(null);
+
+    scope.$broadcast('$destroy');
+
+    expect(ctrl.__getScrollChild()).toBe(null);
+    expect(ctrl.__getScrollParent()).toBe(null);
+  });
 });