Merge branch 'master' into dev

bradrobertson · bradrobertson · commit 494a044a3849 · 2011-10-25T22:10:44.000-04:00
diff --git a/README.md b/README.md
@@ -6,4 +6,7 @@ jQuery Tools is a collection of the most important user-interface components for
 ##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
+
+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/dateinput/dateinput.js b/src/dateinput/dateinput.js
@@ -282,6 +282,10 @@
 			currMonth = date.getMonth();
 			currDay	 = date.getDate();				
 			
+			// focus the input after selection (doesn't work in IE)
+			if (e.type == "click" && !$.browser.msie) {
+				input.focus();
+			}
 			
 			// beforeChange
 			e = e || $.Event("api");
@@ -317,13 +321,13 @@
 				if (e.ctrlKey) { return true; }				
 				var key = e.keyCode;			 
 				
-				// backspace clears the value
-				if (key == 8) {
+				// backspace or delete clears the value
+				if (key == 8 || key == 46) {
 					input.val("");
 					return self.hide(e);	
 				}
 				
-				// esc or tab key
+				// esc or tab key exits
 				if (key == 27 || key == 9) { return self.hide(e); }						
 					
 				if ($(KEYS).index(key) >= 0) {
@@ -664,11 +668,11 @@
 					e.type = "onHide";
 					fire.trigger(e);
 					
-					$(document).unbind("click.d").unbind("keydown.d");
-					
 					// cancelled ?
 					if (e.isDefaultPrevented()) { return; }
 					
+					$(document).unbind("click.d").unbind("keydown.d");
+										
 					// do the hide
 					root.hide();
 					opened = false;
@@ -729,6 +733,10 @@
 				if (!opened &&  $(KEYS).index(key) >= 0) {
 					self.show(e);
 					return e.preventDefault();
+			
+			// clear value on backspace or delete
+			} else if (key == 8 || key == 46) {
+				input.val("");
 				} 
 				
 				// allow tab
