diff --git a/js/angular/controller/refresherController.js b/js/angular/controller/refresherController.js index a8b6724c65c..a3a2045ff3d 100644 --- a/js/angular/controller/refresherController.js +++ b/js/angular/controller/refresherController.js @@ -170,7 +170,7 @@ IonicModule } function overscroll(val) { - scrollChild.style[ionic.CSS.TRANSFORM] = 'translateY(' + val + 'px)'; + scrollChild.style[ionic.CSS.TRANSFORM] = 'translate3d(0, ' + val + 'px, 0)'; lastOverscroll = val; } diff --git a/test/unit/angular/controller/refreshController.unit.js b/test/unit/angular/controller/refreshController.unit.js index 2c2acce168d..db25f5cf8de 100644 --- a/test/unit/angular/controller/refreshController.unit.js +++ b/test/unit/angular/controller/refreshController.unit.js @@ -47,7 +47,7 @@ describe('$ionicRefresh Controller', function() { setup(); function getTy(el) { - return parseInt(el.style[ionic.CSS.TRANSFORM].replace('translateY(', '')); + return parseInt(el.style[ionic.CSS.TRANSFORM].replace('translate3d(0px, ', '')); } ctrl.__handleTouchmove(evt(0)); @@ -68,14 +68,14 @@ describe('$ionicRefresh Controller', function() { ctrl.__handleTouchmove(evt(10)); expect(refresher.classList.contains('invisible')).toBe(false); ctrl.__handleTouchmove(evt(0)); - expect(ctrl.__getScrollChild().style[ionic.CSS.TRANSFORM]).toBe('translateY(0px)'); + expect(ctrl.__getScrollChild().style[ionic.CSS.TRANSFORM]).toBe('translate3d(0px, 0px, 0px)'); expect(ctrl.__getScrollChild().classList.contains('overscroll')).toBe(false); expect(refresher.classList.contains('invisible')).toBe(true); }); it('should activate and deactivate when dragging past activation threshold', function() { function getTy(el) { - return parseInt(el.style[ionic.CSS.TRANSFORM].replace('translateY(', '')); + return parseInt(el.style[ionic.CSS.TRANSFORM].replace('translate3d(0px, ', '')); } setup(); var domMethods = ctrl.getRefresherDomMethods(); @@ -92,7 +92,7 @@ describe('$ionicRefresh Controller', function() { ctrl.__handleTouchmove(evt(0)); timeout.flush(); - expect(ctrl.__getScrollChild().style[ionic.CSS.TRANSFORM]).toBe('translateY(0px)'); + expect(ctrl.__getScrollChild().style[ionic.CSS.TRANSFORM]).toBe('translate3d(0px, 0px, 0px)'); expect(ctrl.__getScrollChild().classList.contains('overscroll')).toBe(false); expect(refresher.classList.contains('invisible')).toBe(true); expect(refresher.classList.contains('active')).toBe(false);