summaryrefslogtreecommitdiff
path: root/framework/Web/Javascripts
diff options
context:
space:
mode:
authortof <>2008-10-16 15:03:15 +0000
committertof <>2008-10-16 15:03:15 +0000
commit5108ff8c65654efa4654b5ea598b3f9f075e16c2 (patch)
treed53cf251370136fb5153b4af14c3e0a93fdcbc7c /framework/Web/Javascripts
parent71f5a719845a9fd131c6513e6001fabe1bc8359f (diff)
Fixed #942
Diffstat (limited to 'framework/Web/Javascripts')
-rw-r--r--framework/Web/Javascripts/source/prado/activecontrols/inlineeditor.js2
1 files changed, 1 insertions, 1 deletions
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);
},