jenkins-bot has submitted this change and it was merged.
Change subject: Cleanup in HtmlTableBuilder
......................................................................
Cleanup in HtmlTableBuilder
Change-Id: I96710993b5b24ecd5e184fb5cc1469af545a8d4b
---
M includes/Html/HtmlTableBuilder.php
1 file changed, 29 insertions(+), 11 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Html/HtmlTableBuilder.php
b/includes/Html/HtmlTableBuilder.php
index 770884a..fec23e4 100644
--- a/includes/Html/HtmlTableBuilder.php
+++ b/includes/Html/HtmlTableBuilder.php
@@ -112,41 +112,59 @@
}
/**
- * Returns table as html.
- *
* @return string
*/
public function toHtml() {
- // Open table
+ $html = $this->getOpenTableHtml();
+
+ $html .= $this->getHeaderHtml();
+ $html .= $this->getRowHtml();
+
+ $html .= Html::closeElement( 'table' );
+
+ return $html;
+ }
+
+ private function getOpenTableHtml() {
$tableClasses = 'wikitable';
+
if ( $this->isSortable ) {
$tableClasses .= ' sortable jquery-tablesort';
}
- $html = Html::openElement(
+
+ return Html::openElement(
'table',
array(
'class' => $tableClasses
)
);
+ }
- // Write headers
- $html .= Html::openElement( 'tr' );
+ private function getHeaderHtml() {
+ $html = Html::openElement( 'tr' );
+
foreach ( $this->headers as $header ) {
$html .= $header->toHtml();
}
- $html .= Html::closeElement( 'tr' );
- // Write rows
+ return $html . Html::closeElement( 'tr' );
+ }
+
+ private function getRowHtml() {
+ $html = '';
+
foreach ( $this->rows as $row ) {
$html .= Html::openElement( 'tr' );
+
+ /**
+ * @var HtmlTableCellBuilder $cell
+ */
foreach ( $row as $cell ) {
$html .= $cell->toHtml();
}
+
$html .= Html::closeElement( 'tr' );
}
-
- // Close table
- $html .= Html::closeElement( 'table' );
return $html;
}
--
To view, visit https://gerrit.wikimedia.org/r/229634
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I96710993b5b24ecd5e184fb5cc1469af545a8d4b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikibaseQuality
Gerrit-Branch: master
Gerrit-Owner: Jeroen De Dauw <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
