From 658451cbc644bc2e2571164615bfa07ca0e88378 Mon Sep 17 00:00:00 2001
From: perry <perry@drifty.com>
Date: Thu, 5 Feb 2015 14:30:39 -0600
Subject: [PATCH] feat(refresher): add elastic drag to native scrolling
 refresher

---
 js/angular/controller/refresherController.js           | 2 +-
 test/html/pull-to-refresh.html                         | 2 +-
 test/unit/angular/controller/refreshController.unit.js | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/js/angular/controller/refresherController.js b/js/angular/controller/refresherController.js
index 8d7f099e47..f5d3f42d47 100644
--- a/js/angular/controller/refresherController.js
+++ b/js/angular/controller/refresherController.js
@@ -115,7 +115,7 @@ IonicModule
 
       isDragging = true;
       // overscroll according to the user's drag so far
-      overscroll(parseInt(deltaY - dragOffset, 10));
+      overscroll(parseInt((deltaY - dragOffset)/3, 10));
 
       // update the icon accordingly
       if (!activated && lastOverscroll > ptrThreshold) {
diff --git a/test/html/pull-to-refresh.html b/test/html/pull-to-refresh.html
index 6f7dbda75a..294c75e681 100644
--- a/test/html/pull-to-refresh.html
+++ b/test/html/pull-to-refresh.html
@@ -23,7 +23,7 @@
 <script>
   angular.module('ionicApp', ['ionic'])
     .config(function($ionicConfigProvider) {
-      //$ionicConfigProvider.scrolling.jsScrolling(false);
+      if(!ionic.Platform.isIOS())$ionicConfigProvider.scrolling.jsScrolling(false);
     })
     .controller('MyCtrl', function($scope, $timeout) {
       $scope.items = ['Item 1', 'Item 2', 'Item 3', 'Item 4', 'Item 5', 'Item 6','Item 7','Item 8','Item 9','Item 10'];
diff --git a/test/unit/angular/controller/refreshController.unit.js b/test/unit/angular/controller/refreshController.unit.js
index deac6cbe4f..9ca4a4d889 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() {
     ctrl.__handleTouchmove(evt(0));
     ctrl.__handleTouchmove(evt(10));
     ctrl.__handleTouchmove(evt(20));
-    expect(ctrl.__getScrollChild().style[ionic.CSS.TRANSFORM]).toBe('translateY(10px)');
+    expect(ctrl.__getScrollChild().style[ionic.CSS.TRANSFORM]).toBe('translateY(3px)');
     expect(ctrl.__getScrollChild().classList.contains('overscroll')).toBe(true);
     expect(refresher.classList.contains('invisible')).toBe(false);
   });
@@ -75,8 +75,8 @@ describe('$ionicRefresh Controller', function() {
 
     ctrl.__handleTouchmove(evt(0));
     ctrl.__handleTouchmove(evt(10));
-    ctrl.__handleTouchmove(evt(100));
-    expect(ctrl.__getScrollChild().style[ionic.CSS.TRANSFORM]).toBe('translateY(90px)');
+    ctrl.__handleTouchmove(evt(300));
+    expect(ctrl.__getScrollChild().style[ionic.CSS.TRANSFORM]).toBe('translateY(96px)');
     expect(ctrl.__getScrollChild().classList.contains('overscroll')).toBe(true);
     expect(refresher.classList.contains('invisible')).toBe(false);
     expect(refresher.classList.contains('active')).toBe(true);