Merging latest 3.1 changes into trunk (r2672-2677)

3 files changed, 27 insertions, 1 deletions

diff --git a/framework/Web/Javascripts/source/prado/validator/validation3.js b/framework/Web/Javascripts/source/prado/validator/validation3.js
index 850536ab..18b1d0c2 100644
--- a/framework/Web/Javascripts/source/prado/validator/validation3.js
+++ b/framework/Web/Javascripts/source/prado/validator/validation3.js
@@ -727,6 +727,9 @@ Prado.WebUI.TValidationSummary.prototype =
 	 */

 	formatMessageBox : function(messages)

 	{

+		if(this.options.DisplayMode == 'HeaderOnly' && this.options.HeaderText)

+			return this.options.HeaderText;

+		

 		var output = this.options.HeaderText ? this.options.HeaderText + "\n" : "";

 		for(var i = 0; i < messages.length; i++)

 		{

diff --git a/framework/Web/TAssetManager.php b/framework/Web/TAssetManager.php
index 7925d209..4abd1788 100644
--- a/framework/Web/TAssetManager.php
+++ b/framework/Web/TAssetManager.php
@@ -179,6 +179,24 @@ class TAssetManager extends TModule
 	}

 

 	/**

+	 * @return array List of published assets

+	 * @since 3.1.6

+	 */

+	protected function getPublished()

+	{

+		return $this->_published;

+	}

+

+	/**

+	 * @param $values List of published assets

+	 * @since 3.1.6

+	 */

+	protected function setPublished($values=array())

+	{

+		$this->_published = $values;

+	}

+

+	/**

 	 * Returns the published path of a file path.

 	 * This method does not perform any publishing. It merely tells you

 	 * if the file path is published, where it will go.

@@ -269,7 +287,7 @@ class TAssetManager extends TModule
 					if(@filemtime($dst.DIRECTORY_SEPARATOR.$file)<@filemtime($src.DIRECTORY_SEPARATOR.$file))

 					{

 						@copy($src.DIRECTORY_SEPARATOR.$file,$dst.DIRECTORY_SEPARATOR.$file);

-						@chmod($dst.DIRECTORY_SEPARATOR.$file, PRADO_CHMOD); 

+						@chmod($dst.DIRECTORY_SEPARATOR.$file, PRADO_CHMOD);

 					}

 				}

 				else

diff --git a/framework/Web/UI/WebControls/TBulletedList.php b/framework/Web/UI/WebControls/TBulletedList.php
index 60cf743e..5f4aa49c 100644
--- a/framework/Web/UI/WebControls/TBulletedList.php
+++ b/framework/Web/UI/WebControls/TBulletedList.php
@@ -103,6 +103,10 @@ class TBulletedList extends TListControl implements IPostBackEventHandler
 		$needStart=false;

 		switch($this->getBulletStyle())

 		{

+			case TBulletStyle::None:

+				$writer->addStyleAttribute('list-style-type','none');

+				$needStart=true;

+				break;

 			case TBulletStyle::Numbered:

 				$writer->addStyleAttribute('list-style-type','decimal');

 				$needStart=true;

@@ -452,6 +456,7 @@ class TBulletedListEventParameter extends TEventParameter
 class TBulletStyle extends TEnumerable

 {

 	const NotSet='NotSet';

+	const None='None';

 	const Numbered='Numbered';

 	const LowerAlpha='LowerAlpha';

 	const UpperAlpha='UpperAlpha';