Merge from branch 3.0 till 913.

4 files changed, 11 insertions, 11 deletions

diff --git a/demos/quickstart/protected/pages/Controls/Samples/TDataGrid/Sample3.page b/demos/quickstart/protected/pages/Controls/Samples/TDataGrid/Sample3.page
index be2f80bc..2864de46 100644
--- a/demos/quickstart/protected/pages/Controls/Samples/TDataGrid/Sample3.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/TDataGrid/Sample3.page
@@ -48,11 +48,11 @@
 		/>

 	<com:TTemplateColumn HeaderText="Rating">

 		<prop:ItemTemplate>

-		<img src="images/star<%#$this->NamingContainer->DataItem['rating']%>.gif" alt="" />

+		<img src="images/star<%#$this->Parent->DataItem['rating']%>.gif" alt="" />

 		</prop:ItemTemplate>

 		<prop:EditItemTemplate>

 		<com:TDropDownList

-			SelectedValue=<%#$this->NamingContainer->DataItem['rating'] %>

+			SelectedValue=<%#$this->Parent->DataItem['rating'] %>

 			ID="Rating">

 			<com:TListItem Value="1" />

 			<com:TListItem Value="2" />

diff --git a/demos/quickstart/protected/pages/Controls/Samples/TDataList/Sample2.page b/demos/quickstart/protected/pages/Controls/Samples/TDataList/Sample2.page
index 4b484b21..a0908f60 100644
--- a/demos/quickstart/protected/pages/Controls/Samples/TDataList/Sample2.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/TDataList/Sample2.page
@@ -26,7 +26,7 @@
 <tr>

   <td>

   <com:TLinkButton

-       Text=<%#$this->Parent->DataItem['id']%>

+       Text=<%#$this->DataItem['id']%>

        CommandName="select"

        />

   <%#$this->DataItem['name']%>

@@ -83,7 +83,7 @@
   <td align="right">Name</td>

   <td><com:TTextBox

            ID="ProductName"

-           Text=<%#$this->Parent->DataItem['name'] %>

+           Text=<%#$this->DataItem['name'] %>

            />

   </td>

 </tr>

@@ -91,7 +91,7 @@
   <td align="right">Quantity</td>

   <td><com:TTextBox

            ID="ProductQuantity"

-           Text=<%#$this->Parent->DataItem['quantity'] %>

+           Text=<%#$this->DataItem['quantity'] %>

            />

   </td>

 </tr>

@@ -99,7 +99,7 @@
   <td align="right">Price</td>

   <td><com:TTextBox

            ID="ProductPrice"

-           Text=<%#$this->Parent->DataItem['price'] %>

+           Text=<%#$this->DataItem['price'] %>

            />

   </td>

 </tr>

@@ -107,7 +107,7 @@
   <td align="right">Imported</td>

   <td><com:TCheckBox

            ID="ProductImported"

-           Checked=<%#$this->Parent->DataItem['imported'] %>

+           Checked=<%#$this->DataItem['imported'] %>

            />

   </td>

 </tr>

diff --git a/demos/quickstart/protected/pages/Controls/Samples/TRepeater/Sample3.page b/demos/quickstart/protected/pages/Controls/Samples/TRepeater/Sample3.page
index 38636962..4b6849e9 100644
--- a/demos/quickstart/protected/pages/Controls/Samples/TRepeater/Sample3.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/TRepeater/Sample3.page
@@ -19,7 +19,7 @@ The following example allows users to modify the existing tabular data using a <
   <td>

   <com:TTextBox

        ID="ProductName"

-       Text=<%#$this->Parent->DataItem['name']%> />

+       Text=<%#$this->DataItem['name']%> />

   </td>

   <td>

   <com:TDropDownList

@@ -29,12 +29,12 @@ The following example allows users to modify the existing tabular data using a <
   <com:TTextBox

        ID="ProductPrice"

        Columns="7"

-       Text=<%#$this->Parent->DataItem['price']%> />

+       Text=<%#$this->DataItem['price']%> />

   </td>

   <td>

   <com:TCheckBox

        ID="ProductImported"

-       Checked=<%#$this->Parent->DataItem['imported']%> />

+       Checked=<%#$this->DataItem['imported']%> />

   <com:TRequiredFieldValidator

        ControlToValidate="ProductName"

        ErrorMessage="Product name cannot be empty."

diff --git a/demos/quickstart/protected/pages/Controls/Samples/TTextBox/Home.page b/demos/quickstart/protected/pages/Controls/Samples/TTextBox/Home.page
index 49d254a8..b6357722 100644
--- a/demos/quickstart/protected/pages/Controls/Samples/TTextBox/Home.page
+++ b/demos/quickstart/protected/pages/Controls/Samples/TTextBox/Home.page
@@ -89,7 +89,7 @@ Safety feature (cross-site scripting prevention):
 <b>SafeText:</b>

 <com:TLabel ID="Output"

 	BackColor="silver"

-	Text=<%#$this->Page->TextBox2->SafeText%> />

+	Text=<%#$this->TextBox2->SafeText%> />

 </td></tr>

 

 </table>