Merge pull request #17 from spekary/bugfix-QHtmlTable

bugfix-QHtmlTable
qcubed · Jul 31, 2016 · f791ac1 · f791ac1
2 parents c166a40 + 0c75816
commit f791ac1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/includes/QDataTableCodeGenerator.php b/includes/QDataTableCodeGenerator.php
@@ -1,9 +1,9 @@
 <?php
 /**
- * Code generator for the DataGrid2 object.
+ * Code generator for the DataTable object.
  */
 
-class QDataTableCodeGenerator extends QSimpleTable_CodeGenerator {
+class QDataTableCodeGenerator extends QHtmlTable_CodeGenerator {
 	/** @var  string */
 	protected $strControlClassName;
 
@@ -17,7 +17,7 @@ public function __construct($strControlClassName = 'QDataTable') {
 	 * @param QCodeGenBase $objCodeGen
 	 * @param QTable $objTable
 	 */
-	public function DataListConstructor(QCodeGenBase $objCodeGen, QTable $objTable) {
+	public function DataListConstructor(QCodeGenBase $objCodeGen, QSqlTable $objTable) {
 		$strClassName = $this->GetControlClass();
 		$strCode = <<<TMPL
 	/**
@@ -44,7 +44,7 @@ public function __construct(\$objParent, \$strControlId = false) {
 
 
 
-	protected function DataListParentMakeEditable(QCodeGenBase $objCodeGen, QTable $objTable) {
+	protected function DataListParentMakeEditable(QCodeGenBase $objCodeGen, QSqlTable $objTable) {
 		$strVarName = $objCodeGen->DataListVarName($objTable);
 
 		$strCode = <<<TMPL
@@ -75,7 +75,7 @@ protected function {$strVarName}_CellClick(\$strFormId, \$strControlId, \$strPar
 	 * @param QTable $objTable
 	 * @return string
 	 */
-	protected function DataListDataBinder(QCodeGenBase $objCodeGen, QTable $objTable) {
+	protected function DataListDataBinder(QCodeGenBase $objCodeGen, QSqlTable $objTable) {
 		$strObjectType = $objTable->ClassName;
 		$strCode = <<<TMPL
    /**
@@ -127,7 +127,7 @@ public function BindData(\$objAdditionalCondition = null, \$objAdditionalClauses
  * @param QTable $objTable
  * @return string
  */
-protected function DataListGetCondition(QCodeGenBase $objCodeGen, QTable $objTable)
+protected function DataListGetCondition(QCodeGenBase $objCodeGen, QSqlTable $objTable)
 {
 	/**
 	 * The following creates a search filter based on the current columns.

diff --git a/includes/QDataTableGen.php b/includes/QDataTableGen.php
@@ -364,7 +364,7 @@
 	 *
 	 */
 
-	class QDataTableGen extends QSimpleTable	{
+	class QDataTableGen extends QHtmlTable	{
 		protected $strJavaScripts = __JQUERY_EFFECTS__;
 		protected $strStyleSheets = __JQUERY_CSS__;
 		/** @var boolean */

diff --git a/install/QDataTable.php b/install/QDataTable.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * QDataTables is an interface to the DataTables jquery control. It is based on a QSimpleTable, and provides
+ * QDataTables is an interface to the DataTables jquery control. It is based on a QHtmlTable, and provides
  * a number of unique styling options that can be very difficult to implement, including:
  * - Javascript only table handling if wanted, such that the entire table can be searched, sorted, paged
  *   and scrolled all in javascript

diff --git a/tools/jq_datatables_gen.php b/tools/jq_datatables_gen.php
@@ -25,7 +25,7 @@ class DataTablesJqDoc extends JqDoc
 
     public function __construct($strBaseUrl)
 	{
-		parent::__construct('DataTables', 'dataTable', 'QDataTable', 'QSimpleTable');
+		parent::__construct('DataTables', 'dataTable', 'QDataTable', 'QHtmlTable');
 
 		$strUrl = $strBaseUrl . 'option';
 		$this->buildOptions($strUrl);