Final iOS fix... FUUUUUUUUUU iPhone!

qTip2 · Apr 13, 2011 · 4d80659 · 4d80659
1 parent 94801a0
commit 4d80659
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 31 deletions.
diff --git a/dist/jquery.qtip.basic.js b/dist/jquery.qtip.basic.js
@@ -9,7 +9,7 @@
 *   http://en.wikipedia.org/wiki/MIT_License
 *   http://en.wikipedia.org/wiki/GNU_General_Public_License
 *
-* Date: Wed Apr 13 23:43:02 2011 +0100
+* Date: Wed Apr 13 23:51:41 2011 +0100
 */
 
 "use strict"; // Enable ECMAScript "strict" operation for this function. See more: http://ejohn.org/blog/ecmascript-5-strict-mode-json-and-more/
@@ -1591,7 +1591,7 @@ PLUGINS = QTIP.plugins = {
 
 			// Compensate for containers scroll if it also has an offsetParent
 			if(container[0] !== docBody || deep > 1) { scroll( container, 1 ); }
-			if(PLUGINS.iOS) { scroll( $(window), -1 ); }
+			if(PLUGINS.iOS < 4.1 && PLUGINS.iOS > 3.1) { scroll( $(window), -1 ); }
 		}
 
 		return pos;
@@ -1600,13 +1600,10 @@ PLUGINS = QTIP.plugins = {
 	/*
 	 * iOS 3.2 - 4.0 scroll fix detection used in offset() function.
 	 */
-	iOS: (function() {
-		var v = parseFloat(
-			('' + (/CPU.*OS ([0-9_]{1,3})|(CPU like).*AppleWebKit.*Mobile/i.exec(navigator.userAgent) || [0,'4_2'])[1])
-				.replace('undefined', '3_2').replace('_','.')
-		);
-		return v < 4.1 && v > 3.1;
-	}()),
+	iOS: parseFloat(
+		('' + (/CPU.*OS ([0-9_]{1,3})|(CPU like).*AppleWebKit.*Mobile/i.exec(navigator.userAgent) || [0,'4_2'])[1])
+			.replace('undefined', '3_2').replace('_','.')
+	),
 
 	/*
 	 * jQuery-secpfic $.fn overrides 

diff --git a/dist/jquery.qtip.css b/dist/jquery.qtip.css
@@ -9,7 +9,7 @@
 *   http://en.wikipedia.org/wiki/MIT_License
 *   http://en.wikipedia.org/wiki/GNU_General_Public_License
 *
-* Date: Wed Apr 13 23:43:02 2011 +0100
+* Date: Wed Apr 13 23:51:41 2011 +0100
 */
 
 /* Fluid class for determining actual width in IE */

diff --git a/dist/jquery.qtip.js b/dist/jquery.qtip.js
@@ -9,7 +9,7 @@
 *   http://en.wikipedia.org/wiki/MIT_License
 *   http://en.wikipedia.org/wiki/GNU_General_Public_License
 *
-* Date: Wed Apr 13 23:43:02 2011 +0100
+* Date: Wed Apr 13 23:51:41 2011 +0100
 */
 
 "use strict"; // Enable ECMAScript "strict" operation for this function. See more: http://ejohn.org/blog/ecmascript-5-strict-mode-json-and-more/
@@ -1591,7 +1591,7 @@ PLUGINS = QTIP.plugins = {
 
 			// Compensate for containers scroll if it also has an offsetParent
 			if(container[0] !== docBody || deep > 1) { scroll( container, 1 ); }
-			if(PLUGINS.iOS) { scroll( $(window), -1 ); }
+			if(PLUGINS.iOS < 4.1 && PLUGINS.iOS > 3.1) { scroll( $(window), -1 ); }
 		}
 
 		return pos;
@@ -1600,13 +1600,10 @@ PLUGINS = QTIP.plugins = {
 	/*
 	 * iOS 3.2 - 4.0 scroll fix detection used in offset() function.
 	 */
-	iOS: (function() {
-		var v = parseFloat(
-			('' + (/CPU.*OS ([0-9_]{1,3})|(CPU like).*AppleWebKit.*Mobile/i.exec(navigator.userAgent) || [0,'4_2'])[1])
-				.replace('undefined', '3_2').replace('_','.')
-		);
-		return v < 4.1 && v > 3.1;
-	}()),
+	iOS: parseFloat(
+		('' + (/CPU.*OS ([0-9_]{1,3})|(CPU like).*AppleWebKit.*Mobile/i.exec(navigator.userAgent) || [0,'4_2'])[1])
+			.replace('undefined', '3_2').replace('_','.')
+	),
 
 	/*
 	 * jQuery-secpfic $.fn overrides 

diff --git a/dist/jquery.qtip.min.js b/dist/jquery.qtip.min.js
diff --git a/dist/jquery.qtip.pack.js b/dist/jquery.qtip.pack.js
diff --git a/src/core.js b/src/core.js
@@ -1549,7 +1549,7 @@ PLUGINS = QTIP.plugins = {
 
 			// Compensate for containers scroll if it also has an offsetParent
 			if(container[0] !== docBody || deep > 1) { scroll( container, 1 ); }
-			if(PLUGINS.iOS) { scroll( $(window), -1 ); }
+			if(PLUGINS.iOS < 4.1 && PLUGINS.iOS > 3.1) { scroll( $(window), -1 ); }
 		}
 
 		return pos;
@@ -1558,13 +1558,10 @@ PLUGINS = QTIP.plugins = {
 	/*
 	 * iOS 3.2 - 4.0 scroll fix detection used in offset() function.
 	 */
-	iOS: (function() {
-		var v = parseFloat(
-			('' + (/CPU.*OS ([0-9_]{1,3})|(CPU like).*AppleWebKit.*Mobile/i.exec(navigator.userAgent) || [0,'4_2'])[1])
-				.replace('undefined', '3_2').replace('_','.')
-		);
-		return v < 4.1 && v > 3.1;
-	}()),
+	iOS: parseFloat(
+		('' + (/CPU.*OS ([0-9_]{1,3})|(CPU like).*AppleWebKit.*Mobile/i.exec(navigator.userAgent) || [0,'4_2'])[1])
+			.replace('undefined', '3_2').replace('_','.')
+	),
 
 	/*
 	 * jQuery-secpfic $.fn overrides