wikimedia/mediawiki-extensions-Cite
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Cite synced 2024-11-24 06:54:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "ve.ui.MWCitationDialog: If the selected ref is not using the template, clear it"

Browse source
This commit is contained in:
jenkins-bot 2019-03-23 12:10:26 +00:00 committed by Gerrit Code Review
parent 53e0f3ba02 a3ef5fdab5
commit 116b98a75e
1 changed files with 26 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
modules/ve-cite/ve.ui.MWCitationDialog.js
View file

@ -68,7 +68,12 @@ ve.ui.MWCitationDialog.prototype.getSelectedNode = function () {
leaves[ 0 ];
}
return transclusionNode || null;
// Only use the selected node if it is the same template as this dialog expects
if ( transclusionNode && transclusionNode.isSingleTemplate( this.citationTemplate ) ) {
return transclusionNode;
}
return null;
};
/**
@ -87,20 +92,21 @@ ve.ui.MWCitationDialog.prototype.initialize = function ( data ) {
*/
ve.ui.MWCitationDialog.prototype.getSetupProcess = function ( data ) {
return ve.ui.MWCitationDialog.super.prototype.getSetupProcess.call( this, data )
.next( function () {
.first( function () {
data = data || {};
this.inDialog = data.inDialog;
this.citationTemplate = data.template;
this.citationTitle = data.title;
}, this )
.next( function () {
this.updateTitle();
// Initialization
if ( this.selectedNode ) {
this.referenceNode = this.getReferenceNode();
if ( this.referenceNode ) {
this.referenceModel = ve.dm.MWReferenceModel.static.newFromReferenceNode(
this.referenceNode
);
}
this.referenceNode = this.getReferenceNode();
if ( this.referenceNode ) {
this.referenceModel = ve.dm.MWReferenceModel.static.newFromReferenceNode(
this.referenceNode
);
}
}, this );
};
@ -160,12 +166,22 @@ ve.ui.MWCitationDialog.prototype.getActionProcess = function ( action ) {
return new OO.ui.Process( function () {
var deferred = $.Deferred();
dialog.checkRequiredParameters().done( function () {
var item,
var item, refDoc,
surfaceModel = dialog.getFragment().getSurface(),
doc = surfaceModel.getDocument(),
internalList = doc.getInternalList(),
obj = dialog.transclusionModel.getPlainObject();
// We had a reference, but no template node (or wrong kind of template node)
if ( dialog.referenceModel && !dialog.selectedNode ) {
refDoc = dialog.referenceModel.getDocument();
// Empty the existing reference, whatever it contained. This allows the dialog to be
// used for arbitrary references (to replace their contents with a citation).
refDoc.commit(
ve.dm.TransactionBuilder.static.newFromRemoval( refDoc, refDoc.getDocumentRange(), true )
);
}
if ( !dialog.referenceModel ) {
// Collapse returns a new fragment, so update dialog.fragment
dialog.fragment = dialog.getFragment().collapseToEnd();