jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/196204 )
Change subject: Drop unused paramaters from wikibase-sitelinkview template
......................................................................
Drop unused paramaters from wikibase-sitelinkview template
The TODO is not relevant any more because the inner element does have
both lang="..." and dir="auto" attributes now. The browser calculates
the direction based on the language, which is fine and exactly what
should happen in that no-JS fallback.
Change-Id: I28f6db1a6065d9b8b147317a55e1cb1d950f4ea4
---
M view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
M view/resources/templates.php
M view/src/SiteLinksView.php
M view/tests/phpunit/SiteLinksViewTest.php
4 files changed, 3 insertions(+), 10 deletions(-)
Approvals:
WMDE-leszek: Looks good to me, approved
Aleksey Bekh-Ivanov (WMDE): Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
b/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
index 4a56e47..c3d2198 100644
--- a/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
+++ b/view/resources/jquery/wikibase/jquery.wikibase.sitelinkview.js
@@ -43,8 +43,6 @@
var site = this._getSite();
return site ? site.getId() : 'new';
},
- '', // FIXME: Unused, drop.
- '', // FIXME: Unused, drop.
function() {
var site = this._getSite();
return site ? site.getId() : '';
diff --git a/view/resources/templates.php b/view/resources/templates.php
index fc2da45..b0e5b86 100644
--- a/view/resources/templates.php
+++ b/view/resources/templates.php
@@ -251,8 +251,8 @@
<<<HTML
<li class="wikibase-sitelinkview wikibase-sitelinkview-$1" data-wb-siteid="$1">
<span class="wikibase-sitelinkview-siteid-container">
- <span class="wikibase-sitelinkview-siteid
wikibase-sitelinkview-siteid-$1" title="$5">$4</span>
- </span><span class="wikibase-sitelinkview-link
wikibase-sitelinkview-link-$1"><!-- wikibase-sitelinkview-pagename -->$6</span>
+ <span class="wikibase-sitelinkview-siteid
wikibase-sitelinkview-siteid-$1" title="$3">$2</span>
+ </span><span class="wikibase-sitelinkview-link
wikibase-sitelinkview-link-$1"><!-- wikibase-sitelinkview-pagename -->$4</span>
</li>
HTML;
diff --git a/view/src/SiteLinksView.php b/view/src/SiteLinksView.php
index 01d9924..29b10d4 100644
--- a/view/src/SiteLinksView.php
+++ b/view/src/SiteLinksView.php
@@ -307,13 +307,8 @@
$siteName = $this->languageNameLookup->getName(
$languageCode );
}
- // TODO: for non-JS, also set the dir attribute on the link
cell;
- // but do not build language objects for each site since it
causes too much load
- // and will fail when having too much site links
return $this->templateFactory->render( 'wikibase-sitelinkview',
htmlspecialchars( $siteId ), // ID used in classes
- '', // FIXME: Unused, drop.
- '', // FIXME: Unused, drop.
htmlspecialchars( $siteId ), // displayed site ID
htmlspecialchars( $siteName ),
$this->getHtmlForPage( $siteLink, $site )
diff --git a/view/tests/phpunit/SiteLinksViewTest.php
b/view/tests/phpunit/SiteLinksViewTest.php
index e4d63a6..e10479f 100644
--- a/view/tests/phpunit/SiteLinksViewTest.php
+++ b/view/tests/phpunit/SiteLinksViewTest.php
@@ -132,7 +132,7 @@
'wikibase-listview' => '$1',
'wikibase-sitelinkgroupview' => '<GROUP data="$5"
class="$7"><h3 id="$1">$2$3</h3>$6$4</GROUP>',
'wikibase-sitelinklistview' => '$1',
- 'wikibase-sitelinkview' => '<LINK id="$1"
title="$5">$4: $6</LINK>',
+ 'wikibase-sitelinkview' => '<LINK id="$1"
title="$3">$2: $4</LINK>',
'wikibase-sitelinkview-pagename' => '<PAGE href="$1"
lang="$4" dir="$5">$2</PAGE>$3',
'wikibase-badgeselector' => '$1',
'wb-badge' => '<BADGE class="$1" id="$3">$2</BADGE>',
--
To view, visit https://gerrit.wikimedia.org/r/196204
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I28f6db1a6065d9b8b147317a55e1cb1d950f4ea4
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Adrian Heine <[email protected]>
Gerrit-Reviewer: Aleksey Bekh-Ivanov (WMDE) <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Ebrahim <[email protected]>
Gerrit-Reviewer: Henning Snater <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: WMDE-leszek <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits