Fixed conflicted setting with .animate(), updated demo

Author: flesler

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "jquery.scrollTo",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Easy element scrolling using jQuery.",
   "homepage": "https://github.com/flesler/jquery.scrollTo",
   "main": [

changes.txt

@@ -1,3 +1,7 @@
+2.0.1
+[Fix]
+- Fixed "queue" setting conflicts with $().animate(), forced to always get there as true
+
 2.0.0
 [Feature]
 - All settings are passed to jQuery.animate() meaning it now supports even more settings

demo/css/style.css

@@ -4,7 +4,7 @@ body{
 	font-family: Verdana, sans-serif;
 	background-color: #DDD;
 }
-ul,li,h1,h2,h3,p{
+ul,li,h1,h2,h3,h4,p{
 	list-style:none;
 	padding:0;
 	margin:0;
@@ -13,7 +13,9 @@ ul,li,h1,h2,h3,p{
 	border:1px solid black;
 	background-color:white;
 }
-	.part h3{
+	.part h3,
+	.part h4,
+	.part h4 a {
 		color:#933;
 	}
 #toc{
@@ -59,21 +61,25 @@ ul,li,h1,h2,h3,p{
 		#toc a{
 			color:#69C;
 		}
-div.section{
+.section{
 	border:1px black solid;
 	width:950px;
 	padding:10px;
 	margin: 5px 0;
 	position:relative;
 	clear:both;
 }
-	div.section h3{
+	.section h3{
 		margin-bottom:10px;
+		margin-left: 8px;
 	}
-	div.section li{
+	.section h4{
+		margin:10px 0 10px 8px;
+	}
+	.section li{
 		float:left;
 	}
-	div.pane{
+	.pane{
 		overflow:auto;
 		clear:left;
 		margin: 10px 0 0 10px;
@@ -104,19 +110,20 @@ ul.elements{
 		ul.elements li p{
 			color:#666;
 		}
-	#pane-options ul.elements li{
+	#pane-settings ul.elements li{
 		margin:5px;
 	}
-	#pane-options{
+	#pane-settings{
 		margin-bottom:10px;
 	}
 ul.links{
 	height:20px;
 	overflow:hidden;
+	padding-left: 5px;
 }
 	ul.links a{
 		color:#69C;
-		margin:0pt 5px;
+		margin:0 0 0 5px;
 	}
 .clear{
 	clear:left;

demo/index.html

@@ -5,7 +5,7 @@
  * http://flesler.blogspot.com/2007/10/jqueryscrollto.html
  * @projectDescription Easy element scrolling using jQuery.
  * @author Ariel Flesler
- * @version 2.0.0
+ * @version 2.0.1
  */
 ;(function(define) {
 	'use strict';
@@ -42,9 +42,8 @@
 			// Speed is still recognized for backwards compatibility
 			duration = duration || settings.duration;
 			// Make sure the settings are given right
-			settings.queue = settings.queue && settings.axis.length > 1;
-
-			if (settings.queue) {
+			var queue = settings.queue && settings.axis.length > 1;
+			if (queue) {
 				// Let's keep the overall duration
 				duration /= 2;
 			}
@@ -122,7 +121,7 @@
 					}
 
 					// Queueing axes
-					if (!i && settings.queue) {
+					if (!i && queue) {
 						// Don't waste time animating, if there's no need.
 						if (prev !== attr[key]) {
 							// Intermediate animation
@@ -137,6 +136,9 @@
 
 				function animate(callback) {
 					var opts = $.extend({}, settings, {
+						// The queue setting conflicts with animate()
+						// Force it to always be true
+						queue: true,
 						duration: duration,
 						complete: callback && function() {
 							callback.call(elem, targ, settings);

jquery.scrollTo.js

@@ -1,6 +1,6 @@
 {
   "name": "jquery.scrollto",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Easy element scrolling using jQuery.",
   "main": "jquery.scrollTo.js",
   "license": "MIT",