summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe.Boulain <>2010-02-15 08:47:50 +0000
committerChristophe.Boulain <>2010-02-15 08:47:50 +0000
commitadf8849d63b53310257d8d129c42262ede2de155 (patch)
tree32791cbb65e409fc3ccd43b8641b40fdf988e935
parent00e8b2c1ac9463c2d108b8f534ac1d9317ae38f7 (diff)
Fixed Issue#222 :
SingleLine TInplaceTextBox now honors the 'Columns' property
-rw-r--r--HISTORY1
-rw-r--r--framework/Web/Javascripts/source/prado/activecontrols/inlineeditor.js2
-rw-r--r--framework/Web/UI/ActiveControls/TInPlaceTextBox.php2
3 files changed, 4 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index b584940e..1e84bc15 100644
--- a/HISTORY
+++ b/HISTORY
@@ -27,6 +27,7 @@ EHN: Add property TValidationSummary.ScrollToSummary to server-side control sinc
EHN: Add property TransactionClass (defaults to System.Data.TDbTransaction) to TDbConnection and modify beginTransaction() (Yves)
ENH: Modify TDbTableInfo::getColumnNames() to store result in private class member (Yves)
ENH: Issue#215 - Add ClientSide property to TDropContainer (googlenew at pcforum.hu, Christophe)
+ENH: Issue#222 - Add Columns property to TInPlaceTextBox (Christophe)
CHG: Issue#218 - Change URL of Javascript Logger (Christophe)
Version 3.1.6 July 22, 2009
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
diff --git a/framework/Web/UI/ActiveControls/TInPlaceTextBox.php b/framework/Web/UI/ActiveControls/TInPlaceTextBox.php
index b8dd666b..a82ee4ec 100644
--- a/framework/Web/UI/ActiveControls/TInPlaceTextBox.php
+++ b/framework/Web/UI/ActiveControls/TInPlaceTextBox.php
@@ -218,9 +218,9 @@ class TInPlaceTextBox extends TActiveTextBox
$options['ExternalControl'] = $this->getExternalControlID();
$options['AutoHide'] = $this->getAutoHideTextBox() == false ? '' : true;
$options['AutoPostBack'] = $this->getAutoPostBack() == false ? '' : true;
+ $options['Columns'] = $this->getColumns();
if($this->getTextMode()==='MultiLine')
{
- $options['Columns'] = $this->getColumns();
$options['Rows'] = $this->getRows();
$options['Wrap'] = $this->getWrap()== false ? '' : true;
}