Improved fix from #1

Bumped to 1.4.3 Demos and tests now use jQuery 1.8.0 Fixed a small visual bug on the demo Added minified version
flesler · d6cce6232adf1045addbe2d8cc60d132d23bd553 · flesler committed Aug 22, 2012 · Aug 22, 2012 · d6cce62
1 parent 2815bc2
commit d6cce6232adf1045addbe2d8cc60d132d23bd553
diff --git a/.gitignore b/.gitignore
@@ -12,4 +12,5 @@ logs
 results
 
 node_modules
-npm-debug.log
+npm-debug.log
+.DS_Store
diff --git a/Makefile b/Makefile
@@ -1,2 +0,0 @@
-VER=1.4.2
-include ../common.mak
diff --git a/changes.txt b/changes.txt
@@ -1,9 +1,10 @@
+1.4.3
 [Enhancement]
 - Limit calculations can be disabled by setting the option 'limit' to false.
 [Misc]
 - Removed support for the deprecated setting 'speed'
-
-TODO: Allow duration to be a function
+[Fix]
+- Removed $.browser.webkit so the plugin works with jQuery +1.8
 
 1.4.2
 [Feature]
diff --git a/demo/css/style.css b/demo/css/style.css
@@ -112,6 +112,7 @@ ul.elements{
 	}
 ul.links{
 	height:20px;
+	overflow:hidden;
 }
 	ul.links a{
 		color:#69C;
diff --git a/demo/index.html b/demo/index.html
@@ -7,8 +7,8 @@
 	<meta name="description" content="Demo of jQuery.ScrollTo. A very light and highly customizable jQuery plugin, to scroll overflowed elements or the window itself, made by Ariel Flesler." />
 	<meta name="robots" content="index,follow" />
 	<link type="text/css" rel="stylesheet" href="css/style.css" />
-	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.1/jquery.min.js"></script>
-	<script type="text/javascript" src="../jquery.scrollTo.js"></script>
+	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js"></script>
+	<script type="text/javascript" src="../jquery.scrollTo-min.js"></script>
 	<script type="text/javascript">
 		jQuery(function( $ ){
 			/**
@@ -82,7 +82,7 @@
 			$('#relative-position-hash').click(function(){				
 				$paneTarget.stop().scrollTo( {top:'-=100px',left:'+=100'}, 500 );
 			});
-			
+			
 			$('#percentage-position').click(function(){				
 				$paneTarget.stop().scrollTo( '50%', 800 );
 			});
diff --git a/demo/index.old.html b/demo/index.old.html
@@ -7,7 +7,7 @@
 	<meta name="description" content="Demo of jQuery.ScrollTo. A very light and highly customizable jQuery plugin, to scroll overflowed elements or the window itself, made by Ariel Flesler." />
 	<meta name="robots" content="index,follow" />
 	<link type="text/css" rel="stylesheet" href="css/style.old.css" />
-	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.1/jquery.min.js"></script>
+	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js"></script>
 	<script type="text/javascript" src="../jquery.scrollTo.js"></script>
 	<script type="text/javascript">
 		jQuery(function( $ ){
@@ -23,14 +23,14 @@
 			$('button').click(function(){//this is not the cleanest way to do this, I'm just keeping it short.
 				var index = parseInt( $(this).prev('input').val() ) || 0;
 				var $c = $(this).parent().next();
-				$c.stop().scrollTo('li:eq('+index+')', {speed:2500, easing:'elasout',axis:$c.attr('id')});
+				$c.stop().scrollTo('li:eq('+index+')', {duration:2500, easing:'elasout',axis:$c.attr('id')});
 			});
 			$('#btn_screen').click(function(){
-				$.scrollTo( $('#txt_screen').val(), {speed:2500} );
+				$.scrollTo( $('#txt_screen').val(), {duration:2500} );
 			});
 			$('div.container a').click(function(){
 				var $c = $(this).parents('.container');
-				$c.stop().scrollTo( 0, {speed:2000,axis:$c.attr('id'), queue:true} );
+				$c.stop().scrollTo( 0, {duration:2000,axis:$c.attr('id'), queue:true} );
 				return false;
 			});
 		});
diff --git a/jquery.scrollTo-min.js b/jquery.scrollTo-min.js
@@ -0,0 +1,7 @@
+/**
+ * Copyright (c) 2007-2012 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
+ * Dual licensed under MIT and GPL.
+ * @author Ariel Flesler
+ * @version 1.4.3
+ */
+;(function($){var h=$.scrollTo=function(a,b,c){$(window).scrollTo(a,b,c)};h.defaults={axis:'xy',duration:parseFloat($.fn.jquery)>=1.3?0:1,limit:true};h.window=function(a){return $(window)._scrollable()};$.fn._scrollable=function(){return this.map(function(){var a=this,isWin=!a.nodeName||$.inArray(a.nodeName.toLowerCase(),['iframe','#document','html','body'])!=-1;if(!isWin)return a;var b=(a.contentWindow||a).document||a.ownerDocument||a;return/webkit/i.test(navigator.userAgent)||b.compatMode=='BackCompat'?b.body:b.documentElement})};$.fn.scrollTo=function(e,f,g){if(typeof f=='object'){g=f;f=0}if(typeof g=='function')g={onAfter:g};if(e=='max')e=9e9;g=$.extend({},h.defaults,g);f=f||g.duration;g.queue=g.queue&&g.axis.length>1;if(g.queue)f/=2;g.offset=both(g.offset);g.over=both(g.over);return this._scrollable().each(function(){var d=this,$elem=$(d),targ=e,toff,attr={},win=$elem.is('html,body');switch(typeof targ){case'number':case'string':if(/^([+-]=)?\d+(\.\d+)?(px|%)?$/.test(targ)){targ=both(targ);break}targ=$(targ,this);if(!targ.length)return;case'object':if(targ.is||targ.style)toff=(targ=$(targ)).offset()}$.each(g.axis.split(''),function(i,a){var b=a=='x'?'Left':'Top',pos=b.toLowerCase(),key='scroll'+b,old=d[key],max=h.max(d,a);if(toff){attr[key]=toff[pos]+(win?0:old-$elem.offset()[pos]);if(g.margin){attr[key]-=parseInt(targ.css('margin'+b))||0;attr[key]-=parseInt(targ.css('border'+b+'Width'))||0}attr[key]+=g.offset[pos]||0;if(g.over[pos])attr[key]+=targ[a=='x'?'width':'height']()*g.over[pos]}else{var c=targ[pos];attr[key]=c.slice&&c.slice(-1)=='%'?parseFloat(c)/100*max:c}if(g.limit&&/^\d+$/.test(attr[key]))attr[key]=attr[key]<=0?0:Math.min(attr[key],max);if(!i&&g.queue){if(old!=attr[key])animate(g.onAfterFirst);delete attr[key]}});animate(g.onAfter);function animate(a){$elem.animate(attr,f,g.easing,a&&function(){a.call(this,e,g)})}}).end()};h.max=function(a,b){var c=b=='x'?'Width':'Height',scroll='scroll'+c;if(!$(a).is('html,body'))return a[scroll]-$(a)[c.toLowerCase()]();var d='client'+c,html=a.ownerDocument.documentElement,body=a.ownerDocument.body;return Math.max(html[scroll],body[scroll])-Math.min(html[d],body[d])};function both(a){return typeof a=='object'?a:{top:a,left:a}}})(jQuery);
diff --git a/jquery.scrollTo.js b/jquery.scrollTo.js
@@ -1,15 +1,13 @@
 /*!
  * jQuery.ScrollTo
- * Copyright (c) 2007-2009 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
+ * Copyright (c) 2007-2012 Ariel Flesler - aflesler(at)gmail(dot)com | http://flesler.blogspot.com
  * Dual licensed under MIT and GPL.
- * Date: 06/05/2009
+ * Date: 22/08/2012
  *
  * @projectDescription Easy element scrolling using jQuery.
  * http://flesler.blogspot.com/2007/10/jqueryscrollto.html
- * Works with jQuery +1.2.6. Tested on FF 2/3, IE 6/7/8, Opera 9.5/6, Safari 3, Chrome 1 on WinXP.
- *
  * @author Ariel Flesler
- * @version 1.4.2
+ * @version 1.4.3
  *
  * @id jQuery.scrollTo
  * @id jQuery.fn.scrollTo
@@ -84,7 +82,7 @@
 
 			var doc = (elem.contentWindow || elem).document || elem.ownerDocument || elem;
 			
-			return /webkit/.test(navigator.userAgent.toLowerCase()) || doc.compatMode == 'BackCompat' ?
+			return /webkit/i.test(navigator.userAgent) || doc.compatMode == 'BackCompat' ?
 				doc.body : 
 				doc.documentElement;
 		});
diff --git a/tests/WinMaxY-compat.html b/tests/WinMaxY-compat.html
@@ -3,7 +3,7 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 	<title>jQuery.ScrollTo</title>
-	<script type="text/javascript" src="../jquery.js"></script>
+	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js"></script>
 	<script type="text/javascript" src="../jquery.scrollTo-min.js"></script>
 	<script type="text/javascript" src="test.js"></script>
 </head>
diff --git a/tests/WinMaxY-quirks.html b/tests/WinMaxY-quirks.html
@@ -2,7 +2,7 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 	<title>jQuery.ScrollTo</title>
-	<script type="text/javascript" src="../jquery.js"></script>
+	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js"></script>
 	<script type="text/javascript" src="../jquery.scrollTo.js"></script>
 	<script type="text/javascript" src="test.js"></script>
 </head>
diff --git a/tests/WinMaxY-to-iframe-compat.html b/tests/WinMaxY-to-iframe-compat.html
@@ -3,7 +3,7 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 	<title>jQuery.ScrollTo</title>
-	<script type="text/javascript" src="../jquery.js"></script>
+	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js"></script>
 	<script type="text/javascript" src="../jquery.scrollTo.js"></script>
 	<script type="text/javascript" src="test.js"></script>
 </head>
diff --git a/tests/WinMaxY-to-iframe-quirks.html b/tests/WinMaxY-to-iframe-quirks.html
@@ -2,7 +2,7 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 	<title>jQuery.ScrollTo</title>
-	<script type="text/javascript" src="../jquery.js"></script>
+	<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.8.0/jquery.min.js"></script>
 	<script type="text/javascript" src="../jquery.scrollTo.js"></script>
 	<script type="text/javascript" src="test.js"></script>
 </head>