From eb8dbeb0fe5c6a76cc6e4855d3ca4f5b149ea4bb Mon Sep 17 00:00:00 2001
From: Max Lynch <max@drifty.com>
Date: Fri, 6 Dec 2013 17:38:42 -0600
Subject: [PATCH] include scroll event interval fix

---
 dist/css/ionic.css                           | 4 +++-
 dist/js/ionic-angular.js                     | 6 ++++--
 js/ext/angular/src/directive/ionicContent.js | 6 ++++--
 scss/_scaffolding.scss                       | 2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/dist/css/ionic.css b/dist/css/ionic.css
index 45f1c77a0d..8d71f3272c 100644
--- a/dist/css/ionic.css
+++ b/dist/css/ionic.css
@@ -2210,7 +2210,9 @@ body, .ionic-body {
   -webkit-font-smoothing: antialiased;
   font-smoothing: antialiased;
   -webkit-backface-visibility: hidden;
-  @incude text-size-adjust(none);
+  -webkit-text-size-adjust: none;
+  -moz-text-size-adjust: none;
+  text-size-adjust: none;
   -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
   -webkit-tap-highlight-color: transparent;
   -webkit-user-select: none;
diff --git a/dist/js/ionic-angular.js b/dist/js/ionic-angular.js
index 77797106db..9937bd9e7c 100644
--- a/dist/js/ionic-angular.js
+++ b/dist/js/ionic-angular.js
@@ -655,7 +655,8 @@ angular.module('ionic.ui.content', [])
       refreshComplete: '=',
       scroll: '@',
       hasScrollX: '@',
-      hasScrollY: '@'
+      hasScrollY: '@',
+      scrollEventInterval: '@'
     },
     compile: function(element, attr, transclude) {
       return function($scope, $element, $attr) {
@@ -716,7 +717,8 @@ angular.module('ionic.ui.content', [])
           // Add timeout to let content render so Scroller.resize grabs the right content height
           $timeout(function() { 
             sv = new ionic.views.Scroll({
-              el: $element[0]
+              el: $element[0],
+              scrollEventInterval: parseInt($scope.scrollEventInterval) || 40
             });
 
             // Activate pull-to-refresh
diff --git a/js/ext/angular/src/directive/ionicContent.js b/js/ext/angular/src/directive/ionicContent.js
index 600a693b01..3b4a0519f3 100644
--- a/js/ext/angular/src/directive/ionicContent.js
+++ b/js/ext/angular/src/directive/ionicContent.js
@@ -31,7 +31,8 @@ angular.module('ionic.ui.content', [])
       refreshComplete: '=',
       scroll: '@',
       hasScrollX: '@',
-      hasScrollY: '@'
+      hasScrollY: '@',
+      scrollEventInterval: '@'
     },
     compile: function(element, attr, transclude) {
       return function($scope, $element, $attr) {
@@ -92,7 +93,8 @@ angular.module('ionic.ui.content', [])
           // Add timeout to let content render so Scroller.resize grabs the right content height
           $timeout(function() { 
             sv = new ionic.views.Scroll({
-              el: $element[0]
+              el: $element[0],
+              scrollEventInterval: parseInt($scope.scrollEventInterval) || 40
             });
 
             // Activate pull-to-refresh
diff --git a/scss/_scaffolding.scss b/scss/_scaffolding.scss
index 214cada7c4..d49fe1570f 100644
--- a/scss/_scaffolding.scss
+++ b/scss/_scaffolding.scss
@@ -22,7 +22,7 @@ body, .ionic-body {
   @include font-smoothing(antialiased);
   //-webkit-perspective: 1000;
   -webkit-backface-visibility: hidden;
-  @incude text-size-adjust(none);
+  @include text-size-adjust(none);
   @include tap-highlight-transparent();
   @include user-select(none);