merged in the patch for progressive rendering from #235; unit tests doesn't evidence any regression, but of course more proper testing is needed

1 files changed, 16 insertions, 12 deletions

diff --git a/framework/Web/UI/TForm.php b/framework/Web/UI/TForm.php
index 561b59cb..f1e8df5a 100644
--- a/framework/Web/UI/TForm.php
+++ b/framework/Web/UI/TForm.php
@@ -4,7 +4,7 @@
  *

  * @author Qiang Xue <qiang.xue@gmail.com>

  * @link http://www.pradosoft.com/

- * @copyright Copyright &copy; 2005-2011 PradoSoft
+ * @copyright Copyright &copy; 2005-2011 PradoSoft

  * @license http://www.pradosoft.com/license/

  * @version $Id$

  * @package System.Web.UI

@@ -72,11 +72,6 @@ class TForm extends TControl
 	public function render($writer)

 	{

 		$page=$this->getPage();

-		$page->beginFormRender($writer);

-		$htmlWriter = Prado::createComponent($this->GetResponse()->getHtmlWriterType(), new TTextWriter());

-		$this->renderChildren( $htmlWriter );

-		$content = $htmlWriter->flush();

-		$page->endFormRender($writer);

 

 		$this->addAttributesToRender($writer);

 		$writer->renderBeginTag('form');

@@ -84,18 +79,27 @@ class TForm extends TControl
 		$cs=$page->getClientScript();

 		if($page->getClientSupportsJavaScript())

 		{

-			$cs->renderHiddenFields($writer);

-			$cs->renderScriptFiles($writer);

+			$cs->renderHiddenFieldsBegin($writer);

+			$cs->renderScriptFilesBegin($writer);

 			$cs->renderBeginScripts($writer);

 

-			$writer->write($content);

-

+ 			$page->beginFormRender($writer);

+ 			$this->renderChildren($writer);

+			$cs->renderHiddenFieldsEnd($writer);

+ 			$page->endFormRender($writer);

+ 

+			$cs->renderScriptFilesEnd($writer);

 			$cs->renderEndScripts($writer);

 		}

 		else

 		{

-			$cs->renderHiddenFields($writer);

-			$writer->write($content);

+			$cs->renderHiddenFieldsBegin($writer);

+

+			$page->beginFormRender($writer);

+			$this->renderChildren($writer);

+			$page->endFormRender($writer);

+

+			$cs->renderHiddenFieldsEnd($writer);

 		}

 

 		$writer->renderEndTag();