jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/384525 )
Change subject: Add constraints indicators to wb-indicators
......................................................................
Add constraints indicators to wb-indicators
This fixes several issues related to unwanted interaction between
Wikibase’s UI code and the constraints gadget, by putting the gadget’s
own elements in a dedicated space where Wikibase won’t mess with them.
Bug: T95403
Bug: T167869
Bug: T169866
Change-Id: I18d98991b72531a0e181092b47b1a6e257fafe1f
Depends-On: I1399233617581eb3b600fb23ea1de1058ebe4811
---
M modules/gadget.js
1 file changed, 12 insertions(+), 16 deletions(-)
Approvals:
Jonas Kress (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/gadget.js b/modules/gadget.js
index 266b4db..6616080 100644
--- a/modules/gadget.js
+++ b/modules/gadget.js
@@ -144,19 +144,14 @@
function addResultsToSnak( results, $snak ) {
var reports = results.map( buildReport ),
list = buildReportList( reports ),
- haveMandatoryViolations,
- $target;
+ haveMandatoryViolations;
if ( list !== null ) {
haveMandatoryViolations = list.items[ 0 ].status ===
'violation';
- $target = $snak.find( '.wikibase-snakview-value
.valueview-instaticmode' );
- if ( $target.length === 0 ) {
- $target = $snak.find(
'.wikibase-snakview-value' );
- }
buildPopup(
list.$element,
- $target,
+ $snak.find( '.wikibase-snakview-indicators' ),
( haveMandatoryViolations ? '' : 'non-' ) +
'mandatory-constraint-violation',
haveMandatoryViolations ? 'wbqc-issues-long' :
'wbqc-potentialissues-long'
);
@@ -216,8 +211,7 @@
problems,
reports,
list,
- $statement,
- $target;
+ $snak;
for ( constraintId in parameterReports ) {
status = parameterReports[ constraintId ].status;
@@ -238,13 +232,15 @@
expanded: false // expanded: true does not work
within a popup
} );
- $statement = $( '.wikibase-statement-' +
constraintId.replace( /\$/g, '\\$' ) +
- '
.wikibase-statementview-mainsnak .wikibase-snakview-value' );
- $target = $statement.find( '.valueview-instaticmode' );
- if ( $target.length === 0 ) {
- $target = $statement;
- }
- buildPopup( list.$element, $target, 'alert',
'wbqc-badparameters-long', 'warning' );
+ $snak = $( '.wikibase-statement-' +
constraintId.replace( /\$/g, '\\$' ) +
+ '
.wikibase-statementview-mainsnak .wikibase-snakview' );
+ buildPopup(
+ list.$element,
+ $snak.find( '.wikibase-snakview-indicators' ),
+ 'alert',
+ 'wbqc-badparameters-long',
+ 'warning'
+ );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/384525
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I18d98991b72531a0e181092b47b1a6e257fafe1f
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/WikibaseQualityConstraints
Gerrit-Branch: master
Gerrit-Owner: Lucas Werkmeister (WMDE) <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
