jenkins-bot has submitted this change and it was merged.
Change subject: Update Wikidata, fix issue with editing site links
......................................................................
Update Wikidata, fix issue with editing site links
Change-Id: I5822fbbbd8eb69edd59bb586779a37c59dbfdfed
---
M composer.lock
M
extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
M vendor/composer/installed.json
3 files changed, 48 insertions(+), 4 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/composer.lock b/composer.lock
index 7a11c20..8921920 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1233,7 +1233,7 @@
"source": {
"type": "git",
"url":
"https://git.wikimedia.org/git/mediawiki/extensions/Wikibase.git";,
- "reference": "a27c944a12807c8e1d92ed9086128c62f4eb9a4a"
+ "reference": "e492c50904830f4836da148b55b013835f98e18a"
},
"require": {
"data-values/common": "~0.2.0",
@@ -1302,7 +1302,7 @@
"issues": "https://bugzilla.wikimedia.org/";,
"irc": "irc://irc.freenode.net/wikidata"
},
- "time": "2014-12-16 14:39:16"
+ "time": "2014-12-16 21:57:46"
},
{
"name": "wikibase/wikimedia-badges",
diff --git
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
index 15fba2c..e2bfa42 100644
---
a/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
+++
b/extensions/Wikibase/lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
@@ -475,6 +475,50 @@
return PARENT.prototype.startEditing.call( this );
},
+ _refreshTablesorter: function() {
+ if( this.isInEditMode() ) {
+ // Re-sorting the table involves reconstructing the
table's DOM. This may lead to
+ // interference with focusing (IE, though it does not
lose focus, is unable to reflect
+ // character input into the input box).
+ return;
+ }
+
+ this.element.removeData( 'tablesorter' );
+
+ if( this.$thead.children().length ) {
+ this.element.tablesorter();
+ this.element.data( 'tablesorter' ).sort( [] );
+ }
+ },
+
+ _refreshTableHeader: function() {
+ var $items = this.$listview.data( 'listview' ).items();
+
+ if( !$items.length ) {
+ this.$thead.empty();
+ return;
+ } else if( this.$thead.children().length ) {
+ this._refreshTablesorter();
+ return;
+ }
+
+ var siteNameMessageKey =
'wikibase-sitelinks-sitename-columnheading';
+
+ // FIXME: quickfix to allow a custom site-name / handling for
the site groups which
+ // are special according to the specialSiteLinkGroups setting
+ if( this.element.data( 'wikibase-sitelinks-group' ) ===
'special' ) {
+ siteNameMessageKey += '-special';
+ }
+
+ this.$thead.append( mw.wbTemplate(
'wikibase-sitelinklistview-thead',
+ mw.message( siteNameMessageKey ).text(),
+ mw.message( 'wikibase-sitelinks-siteid-columnheading'
).text(),
+ mw.message( 'wikibase-sitelinks-link-columnheading'
).text()
+ ) );
+
+ this._refreshTablesorter();
+ },
+
_startEditingInViewport: function() {
/**
* @param {HTMLElement} node
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index c423c5d..bb946d5 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1325,7 +1325,7 @@
"source": {
"type": "git",
"url":
"https://git.wikimedia.org/git/mediawiki/extensions/Wikibase.git";,
- "reference": "a27c944a12807c8e1d92ed9086128c62f4eb9a4a"
+ "reference": "e492c50904830f4836da148b55b013835f98e18a"
},
"require": {
"data-values/common": "~0.2.0",
@@ -1352,7 +1352,7 @@
"conflict": {
"mediawiki/mediawiki": "<1.23"
},
- "time": "2014-12-16 14:39:16",
+ "time": "2014-12-16 21:57:46",
"type": "mediawiki-extension",
"installation-source": "source",
"autoload": {
--
To view, visit https://gerrit.wikimedia.org/r/180326
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5822fbbbd8eb69edd59bb586779a37c59dbfdfed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikidata
Gerrit-Branch: wmf/1.25wmf12c
Gerrit-Owner: Aude <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Tobias Gritschacher <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
