From: Jörn Zaefferer <joern.zaefferer@gmail.com>
Date: Fri, 13 Mar 2015 16:16:24 +0000 (+0100)
Subject: Autocomplete: Simplify _create() method
X-Git-Tag: 1.12.0-beta.1~377
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=4212d072a112d0315df1c26f81764fafd96a478d;p=jquery-ui.git

Autocomplete: Simplify _create() method

Uses logical expressions in place of conditional expressions.

Closes #1490
---

diff --git a/ui/autocomplete.js b/ui/autocomplete.js
index 3a52e1b17..bdf995621 100644
--- a/ui/autocomplete.js
+++ b/ui/autocomplete.js
@@ -76,14 +76,11 @@ $.widget( "ui.autocomplete", {
 			isTextarea = nodeName === "textarea",
 			isInput = nodeName === "input";
 
-		this.isMultiLine =
-			// Textareas are always multi-line
-			isTextarea ? true :
-			// Inputs are always single-line, even if inside a contentEditable element
-			// IE also treats inputs as contentEditable
-			isInput ? false :
-			// All other element types are determined by whether or not they're contentEditable
-			this.element.prop( "isContentEditable" );
+		// Textareas are always multi-line
+		// Inputs are always single-line, even if inside a contentEditable element
+		// IE also treats inputs as contentEditable
+		// All other element types are determined by whether or not they're contentEditable
+		this.isMultiLine = isTextarea || !isInput && this.element.prop( "isContentEditable" );
 
 		this.valueMethod = this.element[ isTextarea || isInput ? "val" : "text" ];
 		this.isNewMenu = true;