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

controller: Move code for transcluded comment errors

Browse source 
This is a problem we can detect at the loading stage, rather than at
the saving stage, so move it from #postReply to #getParsoidCommentData.

Follow-up to e3e4ef9de4.

Change-Id: I19362399f9ff2fdc487ea4900654bc61d990575f
This commit is contained in:
Bartosz Dziewoński 2020-03-09 21:53:41 +01:00
parent 2e0c299a1f
commit 1fff57fdff
1 changed files with 27 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
modules/controller.js
View file

@ -120,29 +120,8 @@ function autoSignWikitext( wikitext ) {
function postReply( widget, parsoidData ) {
var wikitext,
comment = parsoidData.comment,
transcludedFrom, transcludedErrMsg, mwTitle, newParsoidItem;
newParsoidItem = modifier.addListItem( comment );
transcludedFrom = parser.getTranscludedFrom( comment );
if ( transcludedFrom ) {
mwTitle = transcludedFrom === true ? null : mw.Title.newFromText( transcludedFrom );
// If this refers to a template rather than a subpage, we never want to edit it
if ( mwTitle && mwTitle.getNamespaceId() !== mw.config.get( 'wgNamespaceIds' ).template ) {
// TODO: Post the reply to the target page instead
transcludedErrMsg = mw.message( 'discussiontools-error-comment-is-transcluded-title',
mwTitle.getPrefixedText() ).parse();
} else {
transcludedErrMsg = mw.message( 'discussiontools-error-comment-is-transcluded' ).parse();
}
// TODO: This should be shown immediately, rather than after trying to post
return $.Deferred().reject( 'comment-is-transcluded', { errors: [ {
code: 'comment-is-transcluded',
html: transcludedErrMsg
} ] } ).promise();
}
newParsoidItem = modifier.addListItem( comment );
if ( widget.getMode() === 'source' ) {
wikitext = widget.getValue();
wikitext = autoSignWikitext( wikitext );
@ -306,7 +285,9 @@ function getParsoidCommentData( commentId ) {
return getPageData( pageName, oldId )
.then( function ( response ) {
var data = response.visualeditor;
var data, comment, transcludedFrom, transcludedErrMsg, mwTitle;
data = response.visualeditor;
// TODO: error handling
parsoidDoc = ve.parseXhtml( data.content );
// Mirror VE's ve.init.mw.Target.prototype.fixBase behavior:
@ -326,18 +307,38 @@ function getParsoidCommentData( commentId ) {
etag: data.etag
};
// getThreads build the tree structure, currently only
// used to set 'replies'
// getThreads builds the tree structure, currently only
// used to set 'replies' and 'id'
parser.groupThreads( parsoidComments );
parsoidCommentsById = commentsById( parsoidComments );
comment = parsoidCommentsById[ commentId ];
if ( !parsoidCommentsById[ commentId ] ) {
if ( !comment ) {
return $.Deferred().reject( 'comment-disappeared', { errors: [ {
code: 'comment-disappeared',
html: mw.message( 'discussiontools-error-comment-disappeared' ).parse()
} ] } ).promise();
}
transcludedFrom = parser.getTranscludedFrom( comment );
if ( transcludedFrom ) {
mwTitle = transcludedFrom === true ? null : mw.Title.newFromText( transcludedFrom );
// If this refers to a template rather than a subpage, we never want to edit it
if ( mwTitle && mwTitle.getNamespaceId() !== mw.config.get( 'wgNamespaceIds' ).template ) {
// TODO: Post the reply to the target page instead
transcludedErrMsg = mw.message( 'discussiontools-error-comment-is-transcluded-title',
mwTitle.getPrefixedText() ).parse();
} else {
transcludedErrMsg = mw.message( 'discussiontools-error-comment-is-transcluded' ).parse();
}
return $.Deferred().reject( 'comment-is-transcluded', { errors: [ {
code: 'comment-is-transcluded',
html: transcludedErrMsg
} ] } ).promise();
}
return {
comment: parsoidCommentsById[ commentId ],
doc: parsoidDoc,