summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY2
-rw-r--r--framework/Web/Javascripts/source/prado/activecontrols/inlineeditor.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/HISTORY b/HISTORY
index fda47cb2..54d60515 100644
--- a/HISTORY
+++ b/HISTORY
@@ -23,7 +23,7 @@ BUG: Ticket#904 - TDbConnection: Add emulate prepares workaround for boolean com
BUG: Ticket#908 - TDbCache::init / Exception (Knut)
BUG: Ticket#922 - Problem with TUrlMapping and urlencoding (Michael)
BUG: Ticket#938 - TPageStateFormatter EnableStateEncryption causes massive page state (Michael)
-BUG: Ticket#622 - Changing Display-attribute of a TActiveCheckBox dy
+BUG: Ticket#942 - MultiLine TInplaceTextBox (Christophe)
CHG: Ticket#844 - Upgraded TinyMCE to 3.1.0.1 (Christophe)
CHG: Ticket#917 - TUrlMapping - change members to protected (Michael)
CHG: Ticket#919 - TUserManager loadUserData function (Michael)
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);
},