Merge Branches & Trunk

/trunk:r2680,2692,2707-2736
/branches/3.1:r2682-2686,2694-2702,2705,2738-2762

1 files changed, 17 insertions, 0 deletions

diff --git a/framework/Web/UI/WebControls/TValidationSummary.php b/framework/Web/UI/WebControls/TValidationSummary.php
index ab066f78..4ed2eebe 100644
--- a/framework/Web/UI/WebControls/TValidationSummary.php
+++ b/framework/Web/UI/WebControls/TValidationSummary.php
@@ -149,6 +149,22 @@ class TValidationSummary extends TWebControl
 	}

 

 	/**

+	 * @return boolean whether scroll summary into viewport or not. Defaults to true.

+	 */

+	public function getScrollToSummary()

+	{

+		return $this->getViewState('ScrollToSummary',true);

+	}

+

+	/**

+	 * @param boolean whether scroll summary into viewport or not.

+	 */

+	public function setScrollToSummary($value)

+	{

+		$this->setViewState('ScrollToSummary',TPropertyValue::ensureBoolean($value),true);

+	}

+

+	/**

 	 * @return boolean whether the validation summary should be anchored. Defaults to false.

 	 */

 	public function getShowAnchor()

@@ -254,6 +270,7 @@ class TValidationSummary extends TWebControl
 		if(!$this->getShowSummary())

 			$options['ShowSummary']=false;

 

+		$options['ScrollToSummary']=$this->getScrollToSummary();

 		$options['HeaderText']=$this->getHeaderText();

 		$options['DisplayMode']=$this->getDisplayMode();