Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/186750
Change subject: Renamed wb-listview to wikibase-listview
......................................................................
Renamed wb-listview to wikibase-listview
In consistency with wikibase widget naming schema.
Change-Id: I68562e30297a18ee08a3999eb55e89596a83142a
---
M lib/resources/jquery.wikibase/jquery.wikibase.listview.js
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgrouplistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.statementgrouplistview.js
M repo/includes/View/ClaimHtmlGenerator.php
M repo/includes/View/SiteLinksView.php
M repo/includes/View/StatementGroupListView.php
M repo/resources/templates.php
7 files changed, 12 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/50/186750/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.listview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.listview.js
index f7ee5f9..e47e500 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.listview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.listview.js
@@ -81,7 +81,7 @@
* @see jQuery.Widget.options
*/
options: {
- template: 'wb-listview',
+ template: 'wikibase-listview',
templateParams: [
'' // list items
],
@@ -422,9 +422,5 @@
}
} );
-
-// We have to override this here because $.widget sets it no matter what's in
-// the prototype
-$.wikibase.listview.prototype.widgetBaseClass = 'wb-listview';
}( jQuery ) );
diff --git
a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgrouplistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgrouplistview.js
index 0e9ffd5..fb922f1 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgrouplistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgrouplistview.js
@@ -78,7 +78,7 @@
_createListview: function() {
var self = this;
- this.$listview = this.element.find( '.wb-listview' );
+ this.$listview = this.element.find( '.wikibase-listview' );
if( !this.$listview.length ) {
this.$listview = $( '<div/>' ).appendTo( this.element );
diff --git
a/lib/resources/jquery.wikibase/jquery.wikibase.statementgrouplistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.statementgrouplistview.js
index 8db4589..f6ea307 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.statementgrouplistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.statementgrouplistview.js
@@ -110,7 +110,7 @@
_createListview: function() {
var self = this;
- this.$listview = this.element.children( '.wb-listview' );
+ this.$listview = this.element.children( '.wikibase-listview' );
if( !this.$listview.length ) {
this.$listview = $( '<div/>' ).appendTo( this.element );
diff --git a/repo/includes/View/ClaimHtmlGenerator.php
b/repo/includes/View/ClaimHtmlGenerator.php
index 05b4f9a..8db9e31 100644
--- a/repo/includes/View/ClaimHtmlGenerator.php
+++ b/repo/includes/View/ClaimHtmlGenerator.php
@@ -163,7 +163,7 @@
private function wrapInListview( $listviewContent ) {
if( $listviewContent !== '' ) {
- return $this->templateFactory->render( 'wb-listview',
$listviewContent );
+ return $this->templateFactory->render(
'wikibase-listview', $listviewContent );
} else {
return '';
}
diff --git a/repo/includes/View/SiteLinksView.php
b/repo/includes/View/SiteLinksView.php
index 93f2e32..e56e6bf 100644
--- a/repo/includes/View/SiteLinksView.php
+++ b/repo/includes/View/SiteLinksView.php
@@ -115,7 +115,7 @@
}
return $this->templateFactory->render(
'wikibase-sitelinkgrouplistview',
- $this->templateFactory->render( 'wb-listview', $html )
+ $this->templateFactory->render( 'wikibase-listview',
$html )
);
}
diff --git a/repo/includes/View/StatementGroupListView.php
b/repo/includes/View/StatementGroupListView.php
index a139d3d..c3b0eb4 100644
--- a/repo/includes/View/StatementGroupListView.php
+++ b/repo/includes/View/StatementGroupListView.php
@@ -74,7 +74,7 @@
$html = $this->templateFactory->render(
'wikibase-statementgrouplistview',
- $this->templateFactory->render( 'wb-listview',
$claimsHtml )
+ $this->templateFactory->render( 'wikibase-listview',
$claimsHtml )
);
// TODO: Add link to SpecialPage that allows adding a new claim.
diff --git a/repo/resources/templates.php b/repo/resources/templates.php
index 9695c27..c014c63 100644
--- a/repo/resources/templates.php
+++ b/repo/resources/templates.php
@@ -104,12 +104,12 @@
<div class="wikibase-statementview-rankselector">$2</div>
<div class="wikibase-statementview-mainsnak-container">
<div class="wikibase-statementview-mainsnak" dir="auto"><!--
wb-snak -->$3</div>
- <div class="wikibase-statementview-qualifiers"><!-- wb-listview
-->$4</div>
+ <div class="wikibase-statementview-qualifiers"><!--
wikibase-listview -->$4</div>
</div>
<!-- wikibase-toolbar -->$5
<div class="wikibase-statementview-references-container">
<div class="wikibase-statementview-references-heading">$6</div>
- <div class="wikibase-statementview-references"><!-- wb-listview
-->$7</div>
+ <div class="wikibase-statementview-references"><!--
wikibase-listview -->$7</div>
</div>
</div>
HTML;
@@ -130,15 +130,15 @@
HTML;
- $templates['wb-listview'] =
+ $templates['wikibase-listview'] =
<<<HTML
-<div class="wb-listview">$1</div>
+<div class="wikibase-listview">$1</div>
HTML;
$templates['wb-snaklistview'] =
<<<HTML
<div class="wb-snaklistview">
- <div class="wb-snaklistview-listview">$1<!-- wb-listview --></div>
+ <div class="wb-snaklistview-listview"><!-- wikibase-listview -->$1</div>
</div>
HTML;
@@ -231,7 +231,7 @@
$templates['wikibase-sitelinkgrouplistview'] =
<<<HTML
-<div class="wikibase-sitelinkgrouplistview"><!-- wb-listview -->$1</div>
+<div class="wikibase-sitelinkgrouplistview"><!-- wikibase-listview -->$1</div>
HTML;
$templates['wikibase-sitelinkgroupview'] =
--
To view, visit https://gerrit.wikimedia.org/r/186750
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I68562e30297a18ee08a3999eb55e89596a83142a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater <henning.sna...@wikimedia.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
