From c54a230a5926086ff1b69a0dd7e6352dbc0b40ff Mon Sep 17 00:00:00 2001
From: xue <>
Date: Thu, 20 Apr 2006 17:09:09 +0000
Subject: Merge from 3.0 branch till 947.
---
framework/Web/UI/WebControls/THtmlArea.php | 9 ++++++++-
framework/Web/UI/WebControls/TJavascriptLogger.php | 11 +++++++++--
framework/Web/UI/WebControls/TTableRow.php | 3 ++-
3 files changed, 19 insertions(+), 4 deletions(-)
(limited to 'framework/Web/UI/WebControls')
diff --git a/framework/Web/UI/WebControls/THtmlArea.php b/framework/Web/UI/WebControls/THtmlArea.php
index 7ad2d06f..038c7368 100644
--- a/framework/Web/UI/WebControls/THtmlArea.php
+++ b/framework/Web/UI/WebControls/THtmlArea.php
@@ -10,6 +10,11 @@
* @package System.Web.UI
*/
+/**
+ * Includes TTextBox class
+ */
+Prado::using('System.Web.UI.WebControls.TTextBox');
+
/**
* THtmlArea class
*
@@ -73,7 +78,8 @@
*/
class THtmlArea extends TTextBox
{
- protected $langs = array(
+ // Qiang: need to clean up the following (too inefficient)
+ private $langs = array(
'da' => array('da'),
'fa' => array('fa'),
'hu' => array('hu'),
@@ -310,6 +316,7 @@ class THtmlArea extends TTextBox
if(count($variants) == 0)
$variants[] = empty($culture) ? 'en' : strtolower($culture);
+ // TODO: triple loops???
foreach($this->langs as $js => $langs)
{
foreach($variants as $variant)
diff --git a/framework/Web/UI/WebControls/TJavascriptLogger.php b/framework/Web/UI/WebControls/TJavascriptLogger.php
index 3196d3b6..0296a276 100644
--- a/framework/Web/UI/WebControls/TJavascriptLogger.php
+++ b/framework/Web/UI/WebControls/TJavascriptLogger.php
@@ -40,6 +40,15 @@ class TJavascriptLogger extends TWebControl
return 'div';
}
+ /**
+ * Registers the required logger javascript.
+ * @param TEventParameter event parameter
+ */
+ public function onPreRender($param)
+ {
+ $this->getPage()->getClientScript()->registerPradoScript('logger');
+ }
+
/**
* Register the required javascript libraries and
* display some general usage information.
@@ -47,11 +56,9 @@ class TJavascriptLogger extends TWebControl
*/
public function renderContents($writer)
{
- $this->getPage()->getClientScript()->registerPradoScript('logger');
$info = '(<a href="http://gleepglop.com/javascripts/logger/" target="_blank">more info</a>).';
$usage = 'Press ALT-D (Or CTRL-D on OS X) to toggle the javascript log console';
$writer->write("{$usage} {$info}");
- parent::renderContents($writer);
}
}
diff --git a/framework/Web/UI/WebControls/TTableRow.php b/framework/Web/UI/WebControls/TTableRow.php
index 04a1555d..6a3f196a 100644
--- a/framework/Web/UI/WebControls/TTableRow.php
+++ b/framework/Web/UI/WebControls/TTableRow.php
@@ -11,9 +11,10 @@
*/
/**
- * Includes TTableCell class
+ * Includes TTableCell and TTableHeaderCell classes
*/
Prado::using('System.Web.UI.WebControls.TTableCell');
+Prado::using('System.Web.UI.WebControls.TTableHeaderCell');
/**
* TTableRow class.
--
cgit v1.2.3