Merge & tweak closeByClickEvent bug fix. Closes #477

Author: Mottie

js/jquery.keyboard.js

@@ -162,11 +162,9 @@ http://www.opensource.org/licenses/mit-license.php
 			tmp = tmp.add(base.el.ownerDocument);
 		}
 
-		var bindings = 'keyup checkkeyboard ';
-		if(o.closeByClickEvent) {
-			bindings = 'click ';
-		} else {
-			bindings += 'mousedown touchstart ';
+		var bindings = 'keyup checkkeyboard mousedown touchstart ';
+		if (o.closeByClickEvent) {
+			bindings += 'click ';
 		}
 		tmp.bind(bindings.split(' ').join(base.namespace + ' '), base.checkClose);
 
@@ -1613,9 +1611,18 @@ http://www.opensource.org/licenses/mit-license.php
 			if ($keyboard.allie) {
 				e.preventDefault();
 			}
-			// send 'true' instead of a true (boolean), the input won't get a 'ui-keyboard-autoaccepted'
-			// class name - see issue #66
-			base.close(o.autoAccept ? 'true' : false);
+			if (o.closeByClickEvent) {
+				// only close the keyboard if the user is clicking on an input or if he causes a click
+				// event (touchstart/mousedown will not force the close with this setting)
+				var name = e.target.nodeName.toLowerCase();
+				if (name === 'input' || name === 'textarea' || e.type === 'click') {
+					base.close(o.autoAccept ? 'true' : false);
+				}
+			} else {
+				// send 'true' instead of a true (boolean), the input won't get a 'ui-keyboard-autoaccepted'
+				// class name - see issue #66
+				base.close(o.autoAccept ? 'true' : false);
+			}
 		}
 	};