Merge branch 't/9584'

ckeditor · Nov 9, 2012 · ba3a31b · ba3a31b
2 parents 21cba76 + fac600f
commit ba3a31b
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/core/editable.js b/core/editable.js
@@ -620,7 +620,10 @@
 						var control = ev.data.getTarget();
 						if ( control.is( 'img', 'hr', 'input', 'textarea', 'select' ) ) {
 							editor.getSelection().selectElement( control );
-							ev.data.preventDefault();
+
+							// Prevent focus from stealing from the editable. (#9515)
+							if ( control.is( 'input', 'textarea', 'select' ) )
+								ev.data.preventDefault();
 						}
 					});
 				}