diff options
| author | ctrlaltca@gmail.com <> | 2011-06-02 09:56:29 +0000 |
|---|---|---|
| committer | ctrlaltca@gmail.com <> | 2011-06-02 09:56:29 +0000 |
| commit | b9f9a16d7eefc48ac489c8cb2b87749459bb3d38 (patch) | |
| tree | 2cec49f90dd8cd2071bd86efa9c2a6e8a6dfcbe4 /framework | |
| parent | 67666aaccb4b4743a084b214722e1173e827e9d1 (diff) | |
merged documentation changes from branch/3.1 to trunk/
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/Web/UI/ActiveControls/TActiveDataGrid.php | 5 | ||||
| -rw-r--r-- | framework/Web/UI/ActiveControls/TActivePanel.php | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/framework/Web/UI/ActiveControls/TActiveDataGrid.php b/framework/Web/UI/ActiveControls/TActiveDataGrid.php index 358bd414..c298bd2a 100644 --- a/framework/Web/UI/ActiveControls/TActiveDataGrid.php +++ b/framework/Web/UI/ActiveControls/TActiveDataGrid.php @@ -37,8 +37,13 @@ Prado::using('System.Web.UI.WebControls.TCheckBoxColumn'); * * There are also active datagrid columns to work with the TActiveDataGrid, which are * - {@link TActiveBoundColumn}, the active counterpart to {@link TBoundColumn}. + * - {@link TActiveLiteralColumn}, the active counterpart to {@link TLiteralColumn}. + * - {@link TActiveCheckBoxColumn}, the active counterpart to {@link TCheckBoxColumn}. + * - {@link TActiveDropDownListColumn}, the active counterpart to {@link TDropDownListColumn}. + * - {@link TActiveHyperLinkColumn}, the active counterpart to {@link THyperLinkColumn}. * - {@link TActiveEditCommandColumn}, the active counterpart to {@link TEditCommandColumn}. * - {@link TActiveButtonColumn}, the active counterpart to {@link TButtonColumn}. + * - {@link TActiveTemplateColumn}, the active counterpart to {@link TTemplateColumn}. * * Please refer to the original documentation of the regular counterparts for usage. * diff --git a/framework/Web/UI/ActiveControls/TActivePanel.php b/framework/Web/UI/ActiveControls/TActivePanel.php index 25a42eb7..1e7ebbd9 100644 --- a/framework/Web/UI/ActiveControls/TActivePanel.php +++ b/framework/Web/UI/ActiveControls/TActivePanel.php @@ -19,10 +19,10 @@ Prado::using('System.Web.UI.ActiveControls.TActiveControlAdapter'); * TActivePanel is the TPanel active control counterpart.
*
* TActivePanel allows the client-side panel contents to be updated during a
- * callback response using the {@link flush} method.
+ * callback response using the {@link render} method.
*
* Example: Assume $param is an instance of TCallbackEventParameter attached to
- * the OnCallback event a TCallback with ID "callback1", and
+ * the OnCallback event of a TCallback with ID "callback1", and
* "panel1" is the ID of a TActivePanel.
* <code>
* function callback1_requested($sender, $param)
|