summaryrefslogtreecommitdiff
path: root/framework/Web/Javascripts/source
diff options
context:
space:
mode:
authorChristophe.Boulain <>2010-02-15 09:20:35 +0000
committerChristophe.Boulain <>2010-02-15 09:20:35 +0000
commitd860219f366a8fbe63b03d26c69525d4e6bd4f3a (patch)
tree6520a9a0a70a941d122de10d8f5ae9e3883a0ac6 /framework/Web/Javascripts/source
parent94e94e0a8566f23d16658a04c55b0bbfdd6689aa (diff)
Merge from r2765 (and some others) 3.1
Added TActiveTableRow QST page Corrected an uninitialized array in TScaffoldBase
Diffstat (limited to 'framework/Web/Javascripts/source')
-rw-r--r--framework/Web/Javascripts/source/prado/activecontrols/inlineeditor.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/framework/Web/Javascripts/source/prado/activecontrols/inlineeditor.js b/framework/Web/Javascripts/source/prado/activecontrols/inlineeditor.js
index 052a18b0..4d0facc2 100644
--- a/framework/Web/Javascripts/source/prado/activecontrols/inlineeditor.js
+++ b/framework/Web/Javascripts/source/prado/activecontrols/inlineeditor.js
@@ -110,6 +110,8 @@ Prado.WebUI.TInPlaceTextBox = Base.extend(
{
if(this.options.MaxLength > 0)
options['maxlength'] = this.options.MaxLength;
+ if(this.options.Columns > 0)
+ options['size'] = this.options.Columns;
this.editField = INPUT(options);
}
else