From 5108ff8c65654efa4654b5ea598b3f9f075e16c2 Mon Sep 17 00:00:00 2001
From: tof <>
Date: Thu, 16 Oct 2008 15:03:15 +0000
Subject: Fixed #942

---
 framework/Web/Javascripts/source/prado/activecontrols/inlineeditor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'framework/Web/Javascripts/source')

diff --git a/framework/Web/Javascripts/source/prado/activecontrols/inlineeditor.js b/framework/Web/Javascripts/source/prado/activecontrols/inlineeditor.js
index 87b8ddde..51e3f489 100644
--- a/framework/Web/Javascripts/source/prado/activecontrols/inlineeditor.js
+++ b/framework/Web/Javascripts/source/prado/activecontrols/inlineeditor.js
@@ -188,7 +188,7 @@ Prado.WebUI.TInPlaceTextBox = Base.extend(
 			if(this.options.AutoHide)
 				this.showLabel();
 		}
-		else if (Event.keyCode(e) == Event.KEY_RETURN)
+		else if (Event.keyCode(e) == Event.KEY_RETURN && this.options.TextMode != 'MultiLine')
 			Event.stop(e);
 	},
 
-- 
cgit v1.2.3