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

Merge "ArticleTargetSaver: Fix handling for data.result !== 'success'"

Browse source
This commit is contained in:
jenkins-bot 2019-11-19 21:18:01 +00:00 committed by Gerrit Code Review
parent ab62ad729d 1dc642ee57
commit 924e579c19
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/ve-mw/init/targets/ve.init.mw.ArticleTarget.js
View file

@ -1545,11 +1545,14 @@ ve.init.mw.ArticleTarget.prototype.getWikitextDiffPromise = function ( doc ) {
oldid: this.revid,
etag: this.etag
}, 'diff' ).then( function ( data ) {
if ( data.result === 'nochanges' ) {
return data.diff;
}, function ( code, response ) {
// ArticleTargetSaver treats this as an error, this is silly
if ( response.visualeditoredit && response.visualeditoredit.result === 'nochanges' ) {
target.emit( 'noChanges' );
return null;
}
return data.diff;
return ve.createDeferred().reject( code, response ).promise();
} );
this.wikitextDiffPromise
.done( this.emit.bind( this, 'showChanges' ) )

10
modules/ve-mw/preinit/ve.init.mw.ArticleTargetSaver.js
View file

@ -256,11 +256,11 @@
html: 'Invalid response from server'
};
} else if ( data.result !== 'success' ) {
// Note, this could be any of db failure, hookabort, badtoken or even a captcha
error = {
code: 'failure',
html: 'Save failure: ' + mw.html.escape( data.result )
};
// This can only happen when:
// * viewing a diff with no changes (`data.result === 'nochanges'`)
// * saving an edit and getting a captcha (`data.result === 'error'`)
// It's a silly special case...
return $.Deferred().reject( 'no-error-no-success', response ).promise();
} else {
// paction specific errors
switch ( data.paction ) {