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

Merge "Pass error data to SaveErrorHandler on error"

Browse source
This commit is contained in:
jenkins-bot 2018-12-07 19:02:47 +00:00 committed by Gerrit Code Review
parent d1bd119d2a be548979fe
commit 349b93f733
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/ve-mw/init/ve.init.mw.ArticleTarget.js
View file

@ -744,8 +744,6 @@ ve.init.mw.ArticleTarget.prototype.saveFail = function ( doc, saveData, wasRetry
return;
}
editApi = ve.getProp( data, 'visualeditoredit', 'edit' ) || {};
// Handle token errors
if ( data.error && data.error.code === 'badtoken' ) {
if ( wasRetry ) {
@ -782,6 +780,8 @@ ve.init.mw.ArticleTarget.prototype.saveFail = function ( doc, saveData, wasRetry
return;
}
editApi = ve.getProp( data, 'visualeditoredit', 'edit' ) || data.error || {};
for ( name in saveErrorHandlerFactory.registry ) {
handler = saveErrorHandlerFactory.lookup( name );
if ( handler.static.matchFunction( editApi ) ) {

4
modules/ve-mw/init/ve.init.mw.SaveErrorHandler.js
View file

@ -26,7 +26,7 @@ OO.initClass( ve.init.mw.SaveErrorHandler );
* @static
* @inheritable
* @method
* @param {Object} editApi Edit API response
* @param {Object} editApi Edit API response, or error data
* @return {boolean}
*/
ve.init.mw.SaveErrorHandler.static.matchFunction = null;
@ -37,7 +37,7 @@ ve.init.mw.SaveErrorHandler.static.matchFunction = null;
* @static
* @inheritable
* @method
* @param {Object} editApi Edit API response
* @param {Object} editApi Edit API response, or error data
* @param {ve.init.mw.ArticleTarget} target Target
*/
ve.init.mw.SaveErrorHandler.static.process = null;