Update TinyMCE to 2.1, Js prototype to 1.5.1rc, effects to 1.7

2 files changed, 7 insertions, 1 deletions

diff --git a/framework/Web/UI/WebControls/THtmlArea.php b/framework/Web/UI/WebControls/THtmlArea.php
index f70f8d25..91f0f033 100644
--- a/framework/Web/UI/WebControls/THtmlArea.php
+++ b/framework/Web/UI/WebControls/THtmlArea.php
@@ -85,6 +85,7 @@ class THtmlArea extends TTextBox
 			'ar' => 'ar',

 			'ca' => 'ca',

 			'cs' => 'cs',

+			'cy' => 'cy', //available since 3.0.7

 			'da' => 'da',

 			'de' => 'de',

 			'el' => 'el',

@@ -118,7 +119,7 @@ class THtmlArea extends TTextBox
 			'vi' => 'vi',

 			'zh' => 'zh_cn_utf8',

 			'zh_CN' => 'zh_cn_utf8',

-			'zh_HK' => 'zh_tw_utf8',

+			//'zh_HK' => 'zh_tw_utf8', removed from 3.0.7

 			'zh_TW' => 'zh_tw_utf8'

 		);

 

diff --git a/framework/Web/UI/WebControls/TImageButton.php b/framework/Web/UI/WebControls/TImageButton.php
index bd974c64..156c328d 100644
--- a/framework/Web/UI/WebControls/TImageButton.php
+++ b/framework/Web/UI/WebControls/TImageButton.php
@@ -89,8 +89,11 @@ class TImageButton extends TImage implements IPostBackDataHandler, IPostBackEven
 			$writer->addAttribute('name',$uniqueID);

 		if($this->getEnabled(true))

 		{

+			if($this->canCauseValidation())

+			{

 				$writer->addAttribute('id',$this->getClientID());

 				$this->getPage()->getClientScript()->registerPostBackControl('Prado.WebUI.TImageButton',$this->getPostBackOptions());

+			}

 		}

 		else if($this->getEnabled()) // in this case, parent will not render 'disabled'

 			$writer->addAttribute('disabled','disabled');

@@ -140,6 +143,8 @@ class TImageButton extends TImage implements IPostBackDataHandler, IPostBackEven
 		{

 			$this->_x=intval($values["{$uid}_x"]);

 			$this->_y=intval($values["{$uid}_y"]);

+			if($this->getPage()->getPostBackEventTarget()===null)

+				$this->getPage()->setPostBackEventTarget($this);

 		}

 		return false;

 	}