better support for default Android browser

iamkeir · Jun 8, 2013 · 398b625 · 398b625
1 parent 9fe8b7b
commit 398b625
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 16 deletions.
diff --git a/.nodemonignore b/.nodemonignore
@@ -1,3 +1,4 @@
 /build/*
 /dist/*
 /demos/*
+*.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -5,8 +5,8 @@ All contributions are welcome but to enforce the openess of this script I have t
 If you are an individual, please sign the following form:
 http://cubiq.org/iscroll/cla/individual.html
 
-If you are a company or an entity please sing the following form:
-http://cubiq.org/iscroll/cla/individual.html
+If you are a company or an entity please sign the following form:
+http://cubiq.org/iscroll/cla/entity.html
 
 Thanks!
 Matteo Spinelli
diff --git a/build/iscroll-lite.js b/build/iscroll-lite.js
@@ -84,6 +84,8 @@ var utils = (function () {
 		hasTransition: _prefixStyle('transition') in _elementStyle
 	});
 
+	me.isAndroidBrowser = /Android/.test(window.navigator.appVersion) && /Version\/\d/.test(window.navigator.appVersion);
+
 	me.extend(me.style = {}, {
 		transform: _transform,
 		transitionTimingFunction: _prefixStyle('transitionTimingFunction'),
@@ -323,8 +325,8 @@ IScroll.prototype = {
 			return;
 		}
 
-		if ( this.options.preventDefault ) {
-			//e.preventDefault();		// This seems to break default Android browser
+		if ( this.options.preventDefault && !utils.isAndroidBrowser ) {
+			e.preventDefault();		// This seems to break default Android browser
 		}
 
 		var point = e.touches ? e.touches[0] : e,

diff --git a/build/iscroll-probe.js b/build/iscroll-probe.js
@@ -84,6 +84,8 @@ var utils = (function () {
 		hasTransition: _prefixStyle('transition') in _elementStyle
 	});
 
+	me.isAndroidBrowser = /Android/.test(window.navigator.appVersion) && /Version\/\d/.test(window.navigator.appVersion);
+
 	me.extend(me.style = {}, {
 		transform: _transform,
 		transitionTimingFunction: _prefixStyle('transitionTimingFunction'),
@@ -348,8 +350,8 @@ IScroll.prototype = {
 			return;
 		}
 
-		if ( this.options.preventDefault ) {
-			//e.preventDefault();		// This seems to break default Android browser
+		if ( this.options.preventDefault && !utils.isAndroidBrowser ) {
+			e.preventDefault();		// This seems to break default Android browser
 		}
 
 		var point = e.touches ? e.touches[0] : e,

diff --git a/build/iscroll-zoom.js b/build/iscroll-zoom.js
@@ -84,6 +84,8 @@ var utils = (function () {
 		hasTransition: _prefixStyle('transition') in _elementStyle
 	});
 
+	me.isAndroidBrowser = /Android/.test(window.navigator.appVersion) && /Version\/\d/.test(window.navigator.appVersion);
+
 	me.extend(me.style = {}, {
 		transform: _transform,
 		transitionTimingFunction: _prefixStyle('transitionTimingFunction'),
@@ -354,8 +356,8 @@ IScroll.prototype = {
 			return;
 		}
 
-		if ( this.options.preventDefault ) {
-			//e.preventDefault();		// This seems to break default Android browser
+		if ( this.options.preventDefault && !utils.isAndroidBrowser ) {
+			e.preventDefault();		// This seems to break default Android browser
 		}
 
 		var point = e.touches ? e.touches[0] : e,

diff --git a/build/iscroll.js b/build/iscroll.js
@@ -84,6 +84,8 @@ var utils = (function () {
 		hasTransition: _prefixStyle('transition') in _elementStyle
 	});
 
+	me.isAndroidBrowser = /Android/.test(window.navigator.appVersion) && /Version\/\d/.test(window.navigator.appVersion);
+
 	me.extend(me.style = {}, {
 		transform: _transform,
 		transitionTimingFunction: _prefixStyle('transitionTimingFunction'),
@@ -345,8 +347,8 @@ IScroll.prototype = {
 			return;
 		}
 
-		if ( this.options.preventDefault ) {
-			//e.preventDefault();		// This seems to break default Android browser
+		if ( this.options.preventDefault && !utils.isAndroidBrowser ) {
+			e.preventDefault();		// This seems to break default Android browser
 		}
 
 		var point = e.touches ? e.touches[0] : e,

diff --git a/dist/iscroll-lite-min.js b/dist/iscroll-lite-min.js
diff --git a/dist/iscroll-min.js b/dist/iscroll-min.js
diff --git a/dist/iscroll-probe-min.js b/dist/iscroll-probe-min.js
diff --git a/dist/iscroll-zoom-min.js b/dist/iscroll-zoom-min.js
diff --git a/src/core.js b/src/core.js
@@ -101,8 +101,8 @@ IScroll.prototype = {
 			return;
 		}
 
-		if ( this.options.preventDefault ) {
-			//e.preventDefault();		// This seems to break default Android browser
+		if ( this.options.preventDefault && !utils.isAndroidBrowser ) {
+			e.preventDefault();		// This seems to break default Android browser
 		}
 
 		var point = e.touches ? e.touches[0] : e,

diff --git a/src/utils.js b/src/utils.js
@@ -82,6 +82,8 @@ var utils = (function () {
 		hasTransition: _prefixStyle('transition') in _elementStyle
 	});
 
+	me.isAndroidBrowser = /Android/.test(window.navigator.appVersion) && /Version\/\d/.test(window.navigator.appVersion);
+
 	me.extend(me.style = {}, {
 		transform: _transform,
 		transitionTimingFunction: _prefixStyle('transitionTimingFunction'),