wikimedia/mediawiki-extensions-Cite
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Cite synced 2024-12-04 03:18:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Show error message in ref edit dialog for orphaned subref"

Browse source
This commit is contained in:
jenkins-bot 2024-08-23 08:02:54 +00:00 committed by Gerrit Code Review
parent 4d14e6fa61 ce16e4a4cb
commit 1bbae40ca5
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
modules/ve-cite/ve.ui.MWReferenceEditPanel.js
View file

@ -261,18 +261,21 @@ ve.ui.MWReferenceEditPanel.prototype.updateReuseWarningFromRef = function ( ref
* @param {ve.dm.MWReferenceModel} ref * @param {ve.dm.MWReferenceModel} ref
*/ */
ve.ui.MWReferenceEditPanel.prototype.updateExtendsWarningFromRef = function ( ref ) { ve.ui.MWReferenceEditPanel.prototype.updateExtendsWarningFromRef = function ( ref ) {
const mainRefId = this.internalList.keys.indexOf( ref.extendsRef ); if ( ref.extendsRef ) {
if ( mainRefId !== -1 ) { const mainRefId = this.internalList.keys.indexOf( ref.extendsRef );
const itemNode = this.internalList.getItemNode( mainRefId );
const $parentRefPreview = new ve.ui.MWPreviewElement( itemNode, { useView: true } ).$element;
this.extendsWarning.setLabel( this.extendsWarning.setLabel(
$( '<p>' ) $( '<p>' )
.text( mw.msg( 'cite-ve-dialog-reference-editing-extends' ) ) .text( mw.msg( 'cite-ve-dialog-reference-editing-extends' ) )
.append( $parentRefPreview ) .append( mainRefId === -1 ?
$( '<div>' )
.addClass( 've-ui-mwReferenceContextItem-muted' )
.text( ve.msg( 'cite-ve-dialog-reference-missing-parent-ref' ) ) :
new ve.ui.MWPreviewElement( this.internalList.getItemNode( mainRefId ), { useView: true } ).$element )
); );
this.extendsWarning.toggle( true );
} else {
this.extendsWarning.toggle( false );
} }
this.extendsWarning.toggle( mainRefId !== -1 );
}; };
/** /**

5
tests/qunit/ve-cite/ve.ui.MWReferenceEditPanel.test.js
View file

@ -46,12 +46,13 @@ QUnit.test( 'sub refs', ( assert ) => {
assert.false( editPanel.reuseWarning.isVisible() ); assert.false( editPanel.reuseWarning.isVisible() );
assert.true( editPanel.extendsWarning.isVisible() ); assert.true( editPanel.extendsWarning.isVisible() );
assert.true( !!editPanel.extendsWarning.getLabel().text().indexOf( 'Bar' ) ); assert.true( editPanel.extendsWarning.getLabel().text().indexOf( 'Bar' ) !== -1 );
// test sub ref with missing main ref // test sub ref with missing main ref
ref.extendsRef = 'literal/notexist'; ref.extendsRef = 'literal/notexist';
editPanel.setReferenceForEditing( ref ); editPanel.setReferenceForEditing( ref );
assert.false( editPanel.reuseWarning.isVisible() ); assert.false( editPanel.reuseWarning.isVisible() );
assert.false( editPanel.extendsWarning.isVisible() ); assert.true( editPanel.extendsWarning.isVisible() );
assert.true( editPanel.extendsWarning.getLabel().text().indexOf( 'cite-ve-dialog-reference-missing-parent-ref' ) !== -1 );
} ); } );