Merge branch 'master' of github.com:jquerytools/jquerytools

brewt · brewt · commit 662fe03a95b8 · 2011-09-08T14:00:41.000-07:00
diff --git a/README.md b/README.md
@@ -1,4 +1,12 @@
 [jQuery Tools](http://flowplayer.org/tools/) - The Missing UI library for the Web
 ================================
 
-jQuery Tools is a collection of the most important user-interface components for modern websites. Used by large sites all over the world.
+jQuery Tools is a collection of the most important user-interface components for modern websites. Used by large sites all over the world.
+
+##Contributing
+
+Please issue pull requests to the [dev branch](https://github.com/jquerytools/jquerytools/tree/dev).  
+This is where active development takes place, we then merge changes into master for releases. That will become v1.2.6. 
+Most of the development goes to 2.0 which is currently a private repository.
+
+
diff --git a/src/scrollable/scrollable.autoscroll.js b/src/scrollable/scrollable.autoscroll.js
@@ -57,6 +57,11 @@
 				timer = clearInterval(timer);
 			};
 			
+			// resume playing if not stopped
+			api.resume = function() {
+				stopped || api.play();
+			};
+			
 			// when stopped - mouseover won't restart 
 			api.stop = function() {
 				api.pause();
@@ -65,7 +70,7 @@
 		
 			/* when mouse enters, autoscroll stops */
 			if (opts.autopause) {
-				api.getRoot().add(api.getNaviButtons()).hover(api.pause, api.play);
+				api.getRoot().add(api.getNaviButtons()).hover(api.pause, api.resume);
 			}
 			
 			if (opts.autoplay) {
diff --git a/src/validator/validator.js b/src/validator/validator.js
@@ -228,7 +228,7 @@
 		return numRe.test(v);			
 	});
 	
-	v.fn("[max]", "Please enter a value smaller than $1", function(el, v) {
+	v.fn("[max]", "Please enter a value no larger than $1", function(el, v) {
 			
 		// skip empty values and dateinputs
 		if (v === '' || dateInput && el.is(":date")) { return true; }	
@@ -237,7 +237,7 @@
 		return parseFloat(v) <= parseFloat(max) ? true : [max];
 	});
 	
-	v.fn("[min]", "Please enter a value larger than $1", function(el, v) {
+	v.fn("[min]", "Please enter a value of at least $1", function(el, v) {
 
 		// skip empty values and dateinputs
 		if (v === '' || dateInput && el.is(":date")) { return true; }
