diff options
| -rw-r--r-- | HISTORY | 5 | ||||
| -rw-r--r-- | framework/Web/THttpResponse.php | 2 | ||||
| -rw-r--r-- | framework/Web/UI/WebControls/TWizard.php | 17 |
3 files changed, 18 insertions, 6 deletions
@@ -17,6 +17,11 @@ NEW: TJsonService NEW: TCacheDependency, TFileCacheDependency, TDirectoryCacheDependency (Qiang) NEW: TGlobalStateCacheDependency, TChainedCacheDependency, TApplicationStateCacheDependency (Qiang) +Version 3.0.7 +=================== +BUG: Ticket#481 - Unable to cancel navigation when handling OnSideBarButtonClickEvent (Qiang) +BUG: typo in THttpResponse.writeFile() about sending headers (Qiang) + Version 3.0.6 December 4, 2006 ============================== BUG: Ticket#400 - TJavascriptLogger incompatible with Firefox 2.0 RC1 (Wei) diff --git a/framework/Web/THttpResponse.php b/framework/Web/THttpResponse.php index 7a2d7349..be4387e2 100644 --- a/framework/Web/THttpResponse.php +++ b/framework/Web/THttpResponse.php @@ -294,7 +294,7 @@ class THttpResponse extends TModule implements ITextWriter {
header('Pragma: public');
header('Expires: 0');
- header('Cache-Component: must-revalidate, post-check=0, pre-check=0');
+ header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
}
header("Content-type: $mimeType");
header('Content-Length: '.($content===null?filesize($fileName):strlen($content)));
diff --git a/framework/Web/UI/WebControls/TWizard.php b/framework/Web/UI/WebControls/TWizard.php index d72cdf77..33b30de0 100644 --- a/framework/Web/UI/WebControls/TWizard.php +++ b/framework/Web/UI/WebControls/TWizard.php @@ -172,6 +172,10 @@ class TWizard extends TWebControl implements INamingContainer * @var TDataList side bar data list.
*/
private $_sideBarDataList;
+ /**
+ * @var boolean whether navigation should be cancelled (a status set in OnSideBarButtonClick)
+ */
+ private $_cancelNavigation=false;
/**
* @return string tag name for the wizard
@@ -674,7 +678,7 @@ class TWizard extends TWebControl implements INamingContainer * Raises <b>OnCompleteButtonClick</b> event.
* This event is raised when a finish navigation button is clicked in the
* current active step.
- * @param TEventParameter event parameter
+ * @param TWizardNavigationEventParameter event parameter
*/
public function onCompleteButtonClick($param)
{
@@ -687,7 +691,7 @@ class TWizard extends TWebControl implements INamingContainer * Raises <b>OnNextButtonClick</b> event.
* This event is raised when a next navigation button is clicked in the
* current active step.
- * @param TEventParameter event parameter
+ * @param TWizardNavigationEventParameter event parameter
*/
public function onNextButtonClick($param)
{
@@ -698,7 +702,7 @@ class TWizard extends TWebControl implements INamingContainer * Raises <b>OnPreviousButtonClick</b> event.
* This event is raised when a previous navigation button is clicked in the
* current active step.
- * @param TEventParameter event parameter
+ * @param TWizardNavigationEventParameter event parameter
*/
public function onPreviousButtonClick($param)
{
@@ -708,7 +712,7 @@ class TWizard extends TWebControl implements INamingContainer /**
* Raises <b>OnSideBarButtonClick</b> event.
* This event is raised when a link button in the side bar is clicked.
- * @param TEventParameter event parameter
+ * @param TWizardNavigationEventParameter event parameter
*/
public function onSideBarButtonClick($param)
{
@@ -1136,7 +1140,8 @@ class TWizard extends TWebControl implements INamingContainer $this->_activeStepIndexSet=false;
$this->onSideBarButtonClick($navParam);
- if(!$navParam->getCancelNavigation())
+ $this->_cancelNavigation=$navParam->getCancelNavigation();
+ if(!$this->_cancelNavigation)
{
if(!$this->_activeStepIndexSet && $this->allowNavigationToStep($newStepIndex))
$this->setActiveStepIndex($newStepIndex);
@@ -1384,6 +1389,8 @@ class TWizard extends TWebControl implements INamingContainer }
else if(strcasecmp($command,self::CMD_MOVETO)===0)
{
+ if($this->_cancelNavigation) // may be set in onSideBarButtonClick
+ $navParam->setCancelNavigation(true);
$navParam->setNextStepIndex(TPropertyValue::ensureInteger($param->getCommandParameter()));
$handled=true;
}
|