Merge from trunk

1 files changed, 21 insertions, 1 deletions

diff --git a/demos/quickstart/protected/pages/ActiveControls/Home.page b/demos/quickstart/protected/pages/ActiveControls/Home.page
index 5cf4ab17..49855980 100644
--- a/demos/quickstart/protected/pages/ActiveControls/Home.page
+++ b/demos/quickstart/protected/pages/ActiveControls/Home.page
@@ -160,6 +160,12 @@ TActiveButton</a> control. See also the later part of the <a href="?page=Tutoria
 	* <a href="?page=ActiveControls.ValueTriggeredCallback">TValueTriggeredCallback</a>

 	monitors (using a timer) an attribute of an HTML element and triggers a callback request

 	when the attribute value changes.

+	</li>
+	
+	<li>
+	<a href="?page=ActiveControls.DragDrop">TDropContainer & TDraggable</a> represents drag and drop containers. 
+		The former will make its child controls "draggable" while the latter will raise a callback when a draggable
+		control is dropped on it.
 	</li>

 

 </ul>

@@ -310,7 +316,21 @@ if Javascript was disabled on the client's browser.</p>
 	<a href="?page=ActiveControls.ValueTriggeredCallback">TValueTriggeredCallback</a>

 	</td>

 	<td>Yes</td><td>No</td>

-  </tr>

+  </tr>
+  
+  <tr><td>
+  	<a href="?page=ActiveControls.DragDrop">TDropContainer</a>
+  	</td>
+  	<td>Yes</td><td>No</td>
+  </tr>
+
+  <tr><td>
+  	<a href="?page=ActiveControls.DragDrop">TDraggable</a>
+  	</td>
+  	<td>No</td><td>No</td>
+  </tr>
+
+  

 </table>

 

 <h2 id="128036">Active Control Infrastructure Classes</h2>