Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/119459
Change subject: Remove useless and unused wb-last class
......................................................................
Remove useless and unused wb-last class
Again, related to bug 62527.
Change-Id: I95d2ae96349a0efb7c3767a96c73f1f2f8f38570
---
M lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
M lib/resources/templates.php
M lib/tests/qunit/jquery.wikibase/jquery.wikibase.claimview.tests.js
M repo/includes/ClaimHtmlGenerator.php
5 files changed, 13 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/59/119459/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
index 2b811a7..752ff79 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
@@ -73,10 +73,9 @@
options: {
template: 'wb-claim',
templateParams: [
- function() { // class='wb-claim-$2'
+ function() { // class='wb-claim-$1'
return ( this._claim && this._claim.getGuid() )
|| 'new';
},
- 'wb-last', // class: wb-first|wb-last
'', // .wb-claim-mainsnak
'' // Qualifiers
],
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
index ed45f86..1dc831a 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
@@ -24,7 +24,6 @@
options: {
template: 'wb-statement',
templateParams: [
- 'wb-last', // class: wb-first|wb-last
'', // Rank selector
function() { // class='wb-claim-$2'
return ( this._claim && this._claim.getGuid() )
|| 'new';
diff --git a/lib/resources/templates.php b/lib/resources/templates.php
index 655ac33..a26b8b5 100644
--- a/lib/resources/templates.php
+++ b/lib/resources/templates.php
@@ -94,11 +94,11 @@
$templates['wb-claim'] =
<<<HTML
-<div class="wb-claim wb-claim-$1 $2">
+<div class="wb-claim wb-claim-$1">
<div class="wb-claim-mainsnak" dir="auto">
- $3 <!-- wb-snak (Main Snak) -->
+ $2 <!-- wb-snak (Main Snak) -->
</div>
- <div class="wb-claim-qualifiers">$4</div>
+ <div class="wb-claim-qualifiers">$3</div>
</div>
HTML;
@@ -121,18 +121,18 @@
// the non-JS toolbar to attach to. This parameter should be removed.
$templates['wb-statement'] =
<<<HTML
-<div class="wb-statement wb-statementview $1">
- <div class="wb-statement-rank">$2</div>
- <div class="wb-claim wb-claim-$3">
+<div class="wb-statement wb-statementview">
+ <div class="wb-statement-rank">$1</div>
+ <div class="wb-claim wb-claim-$2">
<div class="wb-claim-mainsnak" dir="auto">
- $4 <!-- wb-snak (Main Snak) -->
+ $3 <!-- wb-snak (Main Snak) -->
</div>
- <div class="wb-claim-qualifiers
wb-statement-qualifiers">$5</div>
+ <div class="wb-claim-qualifiers
wb-statement-qualifiers">$4</div>
</div>
- $6 <!-- wikibase-toolbar -->
- <div class="wb-statement-references-heading">$7</div>
+ $5 <!-- wikibase-toolbar -->
+ <div class="wb-statement-references-heading">$6</div>
<div class="wb-statement-references">
- $8 <!-- [0,*] wb-referenceview -->
+ $7 <!-- [0,*] wb-referenceview -->
</div>
</div>
HTML;
diff --git a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.claimview.tests.js
b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.claimview.tests.js
index 45d887e..074e0b1 100644
--- a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.claimview.tests.js
+++ b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.claimview.tests.js
@@ -25,7 +25,7 @@
entityStore: entityStore
};
- return mw.template('wb-claim', 'new', 'wb-last', '', '')
+ return mw.template('wb-claim', 'new', '', '')
.addClass( 'test_claimview' )
.claimview( options );
}
diff --git a/repo/includes/ClaimHtmlGenerator.php
b/repo/includes/ClaimHtmlGenerator.php
index 33e399d..cc935b3 100644
--- a/repo/includes/ClaimHtmlGenerator.php
+++ b/repo/includes/ClaimHtmlGenerator.php
@@ -125,7 +125,6 @@
// @todo: Use 'wb-claim' or 'wb-statement' template accordingly
// @todo: get rid of usage of global wfTemplate function
$claimHtml = wfTemplate( 'wb-statement',
- '', // additional classes
$rankHtml,
$claim->getGuid(),
$mainSnakHtml,
--
To view, visit https://gerrit.wikimedia.org/r/119459
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I95d2ae96349a0efb7c3767a96c73f1f2f8f38570
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang <adrian.l...@wikimedia.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
