aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorScott González <scott.gonzalez@gmail.com>2012-06-25 11:41:24 -0400
committerScott González <scott.gonzalez@gmail.com>2012-06-25 11:41:24 -0400
commit405cbefe5cf0b6b381ae19242f4770f2ffc4c1a0 (patch)
tree1885246492d7aa9ca11c27c922fd06b78d7017ca /ui
parent535ef2a01c27857cf9e11c86beea97890266e018 (diff)
downloadjquery-ui-405cbefe5cf0b6b381ae19242f4770f2ffc4c1a0.tar.gz
jquery-ui-405cbefe5cf0b6b381ae19242f4770f2ffc4c1a0.zip
Autocomplete: Check for contenteditable via isContentEditable property rather than [contenteditable] selector. Properly accounts for properties vs. attributes and 'inherit'.
Diffstat (limited to 'ui')
-rw-r--r--ui/jquery.ui.autocomplete.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/jquery.ui.autocomplete.js b/ui/jquery.ui.autocomplete.js
index f73fff96d..665cf2066 100644
--- a/ui/jquery.ui.autocomplete.js
+++ b/ui/jquery.ui.autocomplete.js
@@ -55,7 +55,7 @@ $.widget( "ui.autocomplete", {
// search term. #7799
var suppressKeyPress, suppressKeyPressRepeat, suppressInput;
- this.isMultiLine = this.element.is( "textarea,[contenteditable]" );
+ this.isMultiLine = this.element.is( "textarea" ) || this.element.prop( "isContentEditable" );
this.valueMethod = this.element[ this.element.is( "input,textarea" ) ? "val" : "text" ];
this.isNewMenu = true;