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

Merge "Remove "unrecoverable" errors from the save dialog"

Browse source
This commit is contained in:
jenkins-bot 2022-07-20 12:46:36 +00:00 committed by Gerrit Code Review
parent ab8bc614a8 43ce20b726
commit 84800d0eef
1 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -808,12 +808,10 @@ ve.init.mw.ArticleTarget.prototype.saveFail = function ( doc, saveData, wasRetry
*
* @param {string|jQuery|Node[]} msg Message content (string of HTML, jQuery object or array of
* Node objects)
* @param {boolean} [allowReapply=true] Whether or not to allow the user to reapply.
* Reset when swapping panels. Assumed to be true unless explicitly set to false.
* @param {boolean} [warning=false] Whether or not this is a warning.
*/
ve.init.mw.ArticleTarget.prototype.showSaveError = function ( msg, allowReapply, warning ) {
this.saveDeferred.reject( [ new OO.ui.Error( msg, { recoverable: allowReapply, warning: warning } ) ] );
ve.init.mw.ArticleTarget.prototype.showSaveError = function ( msg, warning ) {
this.saveDeferred.reject( [ new OO.ui.Error( msg, { warning: warning } ) ] );
};
/**
@ -833,10 +831,7 @@ ve.init.mw.ArticleTarget.prototype.extractErrorMessages = function ( data ) {
* Handle general save error
*/
ve.init.mw.ArticleTarget.prototype.saveErrorEmpty = function () {
this.showSaveError(
this.extractErrorMessages( null ),
false /* prevents reapply */
);
this.showSaveError( this.extractErrorMessages( null ) );
};
/**
@ -888,7 +883,7 @@ ve.init.mw.ArticleTarget.prototype.saveErrorBadToken = function () {
* @param {Object|null} data API response data
*/
ve.init.mw.ArticleTarget.prototype.saveErrorUnknown = function ( data ) {
this.showSaveError( this.extractErrorMessages( data ), false );
this.showSaveError( this.extractErrorMessages( data ) );
};
/**
@ -897,7 +892,7 @@ ve.init.mw.ArticleTarget.prototype.saveErrorUnknown = function ( data ) {
ve.init.mw.ArticleTarget.prototype.saveErrorPageDeleted = function () {
this.pageDeletedWarning = true;
// The API error message 'apierror-pagedeleted' is poor, make our own
this.showSaveError( mw.msg( 'visualeditor-recreate', mw.msg( 'ooui-dialog-process-continue' ) ), true, true );
this.showSaveError( mw.msg( 'visualeditor-recreate', mw.msg( 'ooui-dialog-process-continue' ) ), true );
};
/**
@ -906,7 +901,7 @@ ve.init.mw.ArticleTarget.prototype.saveErrorPageDeleted = function () {
* @param {Object} data API response data
*/
ve.init.mw.ArticleTarget.prototype.saveErrorReadOnly = function ( data ) {
this.showSaveError( this.extractErrorMessages( data ), true, true );
this.showSaveError( this.extractErrorMessages( data ), true );
};
/**