Merge from r2765 (and some others) 3.1

Added TActiveTableRow QST page
Corrected an uninitialized array in TScaffoldBase

2 files changed, 46 insertions, 0 deletions

diff --git a/tests/FunctionalTests/active-controls/protected/pages/TActiveFileUploadAutoPostBackTest.page b/tests/FunctionalTests/active-controls/protected/pages/TActiveFileUploadAutoPostBackTest.page
new file mode 100755
index 00000000..41390e52
--- /dev/null
+++ b/tests/FunctionalTests/active-controls/protected/pages/TActiveFileUploadAutoPostBackTest.page
@@ -0,0 +1,14 @@
+<com:TForm ID="form1">
+
+	<h1 id="heading">TActiveFileUpload AutoPostBack Functional Test</h1>
+	<com:TActiveFileUpload ID='uploader' OnFileUpload="uploadComplete" AutoPostBack="false"/>
+	
+	<com:TActiveButton ID="button1" Text="Submit File"/>
+	
+	<com:TActiveButton ID="button2" Text="This won't submit the file"/>
+	
+	<com:TActiveLabel ID="label1" Text="Label 1" />
+
+	<com:TJavascriptLogger />
+
+</com:TForm>
\ No newline at end of file
diff --git a/tests/FunctionalTests/active-controls/protected/pages/TActiveFileUploadAutoPostBackTest.php b/tests/FunctionalTests/active-controls/protected/pages/TActiveFileUploadAutoPostBackTest.php
new file mode 100755
index 00000000..816a899e
--- /dev/null
+++ b/tests/FunctionalTests/active-controls/protected/pages/TActiveFileUploadAutoPostBackTest.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * BActiveFileUploadTest.php
+ * 
+ * @author Bradley Booms <Bradley.Booms@nsighttel.com>
+ * @version Creation Date: Aug 9, 2007
+ */
+
+/**
+ * BActiveFileUploadTest.php class
+ * 
+ * 
+ * 
+ * Properties
+ * -
+ * 
+ * @author Bradley Booms <Bradley.Booms@nsighttel.com>
+ * @version Modified Date: Aug 9, 2007
+ * 
+ * Modifications:
+ */
+class TActiveFileUploadAutoPostBackTest extends TPage{
+	public function onPreRender($param){
+		parent::onPreRender($param);
+		$this->button1->Attributes->onclick = "{$this->uploader->getCallbackJavascript()}; return false;";
+	}
+	
+	public function uploadComplete($sender, $param){
+		$this->label1->setText($sender->getFileName());
+	}
+}
+?>
\ No newline at end of file