diff options
Diffstat (limited to 'lib/prado/framework/Web')
6 files changed, 10 insertions, 7 deletions
diff --git a/lib/prado/framework/Web/Javascripts/source/prado/controls/controls.js b/lib/prado/framework/Web/Javascripts/source/prado/controls/controls.js index 9eff6a1..022dddc 100644 --- a/lib/prado/framework/Web/Javascripts/source/prado/controls/controls.js +++ b/lib/prado/framework/Web/Javascripts/source/prado/controls/controls.js @@ -316,7 +316,7 @@ Prado.WebUI.TImageButton = jQuery.klass(Prado.WebUI.PostBackControl, y = y < 0 ? 0 : y; var id = this.element.id; var name = options['EventTarget']; - var form = this.element.form; + var form = this.element.form || jQuery('#PRADO_PAGESTATE').get(0).form; var input=null; input = document.createElement("input"); diff --git a/lib/prado/framework/Web/Javascripts/source/prado/prado.js b/lib/prado/framework/Web/Javascripts/source/prado/prado.js index 3778903..2000537 100644 --- a/lib/prado/framework/Web/Javascripts/source/prado/prado.js +++ b/lib/prado/framework/Web/Javascripts/source/prado/prado.js @@ -271,7 +271,7 @@ var Prado = * Version of Prado clientscripts * @var Version */ - Version: '3.3.1', + Version: '3.3.2', /** * Registry for Prado components diff --git a/lib/prado/framework/Web/UI/ActiveControls/TActiveFileUpload.php b/lib/prado/framework/Web/UI/ActiveControls/TActiveFileUpload.php index 0435041..4d7d8dc 100755 --- a/lib/prado/framework/Web/UI/ActiveControls/TActiveFileUpload.php +++ b/lib/prado/framework/Web/UI/ActiveControls/TActiveFileUpload.php @@ -36,6 +36,8 @@ Prado::using('System.Web.UI.WebControls.TFileUpload'); * a status icon is displayed; either a green checkmark if the upload is successful, * or a red x if there was an error. * + * TActiveFileUpload needs either an application level cache or a security manager to work securely. + * * @author Bradley Booms <Bradley.Booms@nsighttel.com> * @author Christophe Boulain <Christophe.Boulain@gmail.com> * @package System.Web.UI.ActiveControls diff --git a/lib/prado/framework/Web/UI/JuiControls/TJuiControlAdapter.php b/lib/prado/framework/Web/UI/JuiControls/TJuiControlAdapter.php index 7feac4f..ea91f15 100644 --- a/lib/prado/framework/Web/UI/JuiControls/TJuiControlAdapter.php +++ b/lib/prado/framework/Web/UI/JuiControls/TJuiControlAdapter.php @@ -11,6 +11,7 @@ Prado::using('System.Web.UI.ActiveControls.TActiveControlAdapter'); Prado::using('System.Web.UI.JuiControls.TJuiControlOptions'); +Prado::using('System.Web.UI.ActiveControls.TCallbackEventParameter'); /** * TJuiControlAdapter class diff --git a/lib/prado/framework/Web/UI/JuiControls/TJuiDialog.php b/lib/prado/framework/Web/UI/JuiControls/TJuiDialog.php index cd349f1..3c5e351 100644 --- a/lib/prado/framework/Web/UI/JuiControls/TJuiDialog.php +++ b/lib/prado/framework/Web/UI/JuiControls/TJuiDialog.php @@ -82,7 +82,7 @@ class TJuiDialog extends TActivePanel implements IJuiOptions, ICallbackEventHand */ public function getValidOptions() { - return array('appendTo', 'autoOpen', 'buttons', 'closeOnEscape', 'closeText', 'dialogClass', 'draggable', 'height', 'hide', 'minHeight', 'minWidth', 'maxHeight', 'maxWidth', 'modal', 'position', 'resizeable', 'show', 'title', 'width'); + return array('appendTo', 'autoOpen', 'buttons', 'closeOnEscape', 'closeText', 'dialogClass', 'draggable', 'height', 'hide', 'minHeight', 'minWidth', 'maxHeight', 'maxWidth', 'modal', 'position', 'resizable', 'show', 'title', 'width'); } /** @@ -100,6 +100,9 @@ class TJuiDialog extends TActivePanel implements IJuiOptions, ICallbackEventHand protected function getPostBackOptions() { $options = $this->getOptions()->toArray(); + // always make the dialog a child of the form, or its inner inputs won't be collected + if(!isset($options['appendTo'])) + $options['appendTo'] = 'form:first'; foreach($this->getControls() as $control) if($control instanceof TJuiDialogButton) diff --git a/lib/prado/framework/Web/UI/TControl.php b/lib/prado/framework/Web/UI/TControl.php index 1b8a213..caf0e0c 100644 --- a/lib/prado/framework/Web/UI/TControl.php +++ b/lib/prado/framework/Web/UI/TControl.php @@ -795,10 +795,7 @@ class TControl extends TApplicationComponent implements IRenderable, IBindable if($this->_trackViewState) { unset($this->_tempState[$key]); - if($value===$defaultValue) - unset($this->_viewState[$key]); - else - $this->_viewState[$key]=$value; + $this->_viewState[$key]=$value; } else { |