jenkins-bot has submitted this change and it was merged.
Change subject: Updated site id input
......................................................................
Updated site id input
- $.wikibase.siteselector displays site id only on selecting a site
- Added $.inputautoexpand functionality to site id input
Bug: T76214
Change-Id: I75ca700e08dcd88b00a0c52608f1d083ae485f23
---
M lib/resources/jquery.wikibase-shared/jquery.wikibase.siteselector.js
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js
M
lib/resources/jquery.wikibase/themes/default/jquery.wikibase.sitelinklistview.css
4 files changed, 32 insertions(+), 2 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/lib/resources/jquery.wikibase-shared/jquery.wikibase.siteselector.js
b/lib/resources/jquery.wikibase-shared/jquery.wikibase.siteselector.js
index f7a3f83..d9b027e 100644
--- a/lib/resources/jquery.wikibase-shared/jquery.wikibase.siteselector.js
+++ b/lib/resources/jquery.wikibase-shared/jquery.wikibase.siteselector.js
@@ -245,7 +245,7 @@
* @return {string}
*/
_createItemValue: function( site ) {
- return site.getShortName() + ' (' + site.getId() + ')';
+ return site.getId();
},
/**
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
index c16af18..9f9ff8c 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
@@ -496,6 +496,19 @@
} else if( isValid && !isEmpty && isDisabled ) {
removetoolbar.enable();
}
+
+ // Update inputautoexpand maximum width after
adding "remove" toolbar:
+ var $siteIdInput = sitelinkview.$siteId.find(
'input' ),
+ inputautoexpand = $siteIdInput.length
+ ? $siteIdInput.data(
'inputautoexpand' )
+ : null;
+ if( inputautoexpand ) {
+ $siteIdInput.inputautoexpand( {
+ maxWidth: $sitelinkview.width()
- (
+
sitelinkview.$siteIdContainer.outerWidth( true ) - $siteIdInput.width()
+ )
+ } );
+ }
} );
},
sitelinkgroupviewafterstopediting: function( event,
toolbarcontroller ) {
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js
index e3481c0..583a267 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkview.js
@@ -255,10 +255,26 @@
pagesuggester.option( 'siteId', siteId );
self._trigger( 'change' );
- } );
+ } )
+ .on(
+ 'siteselectorselected.' + this.widgetName + '
siteselectorchange.' + this.widgetName,
+ function( event, siteId ) {
+ var inputautoexpand = $siteIdInput.data(
'inputautoexpand' );
+
+ if( inputautoexpand ) {
+ inputautoexpand.expand();
+ }
+ }
+ );
this.$siteId.append( $siteIdInput );
+ $siteIdInput.inputautoexpand( {
+ maxWidth: this.element.width() - (
+ this.$siteIdContainer.outerWidth( true ) -
$siteIdInput.width()
+ )
+ } );
+
$pageNameInput
.on( 'keydown.' + this.widgetName, function( event ) {
if( event.keyCode === $.ui.keyCode.BACKSPACE &&
$pageNameInput.val() === '' ) {
diff --git
a/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.sitelinklistview.css
b/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.sitelinklistview.css
index b9e2705..2898caf 100644
---
a/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.sitelinklistview.css
+++
b/lib/resources/jquery.wikibase/themes/default/jquery.wikibase.sitelinklistview.css
@@ -35,6 +35,7 @@
line-height: 1.5;
padding-left: 0.2em;
padding-right: 0;
+ white-space: nowrap;
}
.wikibase-sitelinklistview .wikibase-sitelinkview
.wikibase-sitelinkview-siteid-container .wikibase-sitelinkview-siteid {
--
To view, visit https://gerrit.wikimedia.org/r/176668
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I75ca700e08dcd88b00a0c52608f1d083ae485f23
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater <henning.sna...@wikimedia.de>
Gerrit-Reviewer: Adrian Lang <adrian.l...@wikimedia.de>
Gerrit-Reviewer: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
Gerrit-Reviewer: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
