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

Move edit conflict retry code to controller

Browse source 
Change-Id: Id14e93624d1828253402c04c97193fd686f67d9f
This commit is contained in:
Ed Sanders 2020-03-03 13:25:14 +00:00
parent 126266c741
commit 3274b0c9df
2 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
modules/controller.js
View file

@ -143,7 +143,32 @@ function postReply( widget, parsoidData ) {
// This appears redundant currently, but as editing / new-topics get added, we'll expand it
dttags: [ 'discussiontools', 'discussiontools-reply', 'discussiontools-' + widget.mode ].join( ',' )
}
);
).catch( function ( code, data ) {
// Handle edit conflicts. Load the latest revision of the page, then try again. If the parent
// comment has been deleted from the page, or if retry also fails for some other reason, the
// error is handled as normal below.
if ( code === 'editconflict' ) {
return widget.api.get( {
action: 'query',
prop: 'revisions',
rvprop: 'ids',
rvlimit: 1,
titles: mw.config.get( 'wgRelevantPageName' ),
formatversion: 2
} ).then( function ( resp ) {
var latestRevId = resp.query.pages[ 0 ].revisions[ 0 ].revid;
mw.config.set( {
wgCurRevisionId: latestRevId,
wgRevisionId: latestRevId
} );
// eslint-disable-next-line no-use-before-define
return getParsoidCommentData( widget.comment.id ).then( function ( parsoidData ) {
return postReply( widget, parsoidData );
} );
} );
}
return $.Deferred().reject( code, data ).promise();
} );
}
function highlight( comment ) {

24
modules/dt.ui.ReplyWidget.js
View file

@ -283,30 +283,6 @@ ReplyWidget.prototype.onReplyClick = function () {
logger( { action: 'saveAttempt' } );
return controller.postReply( widget, parsoidData );
} ).catch( function ( code, data ) {
// Handle edit conflicts. Load the latest revision of the page, then try again. If the parent
// comment has been deleted from the page, or if retry also fails for some other reason, the
// error is handled as normal below.
if ( code === 'editconflict' ) {
return widget.api.get( {
action: 'query',
prop: 'revisions',
rvprop: 'ids',
rvlimit: 1,
titles: mw.config.get( 'wgRelevantPageName' ),
formatversion: 2
} ).then( function ( resp ) {
var latestRevId = resp.query.pages[ 0 ].revisions[ 0 ].revid;
mw.config.set( {
wgCurRevisionId: latestRevId,
wgRevisionId: latestRevId
} );
return controller.getParsoidCommentData( widget.comment.id ).then( function ( parsoidData ) {
return controller.postReply( widget, parsoidData );
} );
} );
}
return $.Deferred().reject( code, data ).promise();
} ).then( function ( data ) {
// eslint-disable-next-line no-jquery/no-global-selector
var $container = $( '#mw-content-text' );