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

Merge "Fix badtoken handling broken by 7557dd39ed3"

Browse source
This commit is contained in:
jenkins-bot 2013-07-30 23:51:32 +00:00 committed by Gerrit Code Review
parent 0d30e1e77d e23df9f5a7
commit b3fef14dad
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
View file

@ -456,13 +456,6 @@ ve.init.mw.ViewPageTarget.prototype.onSaveError = function ( jqXHR, status, data
return;
}
if ( data.error ) {
ve.init.mw.Target.onSerializeError.call(
this, null, 'Unsuccessful request: ' + data.error.info, null
);
return;
}
editApi = data && data.visualeditoredit && data.visualeditoredit.edit;
// Handle spam blacklist error (either from core or from Extension:SpamBlacklist)
@ -481,7 +474,7 @@ ve.init.mw.ViewPageTarget.prototype.onSaveError = function ( jqXHR, status, data
// Handle warnings/errors from Extension:AbuseFilter
// TODO: Move this to a plugin
if ( editApi.info && editApi.info.indexOf( 'Hit AbuseFilter:' ) === 0 && editApi.warning ) {
if ( editApi && editApi.info && editApi.info.indexOf( 'Hit AbuseFilter:' ) === 0 && editApi.warning ) {
this.showMessage(
'api-save-error',
$.parseHTML( editApi.warning ),
@ -620,9 +613,9 @@ ve.init.mw.ViewPageTarget.prototype.onSaveError = function ( jqXHR, status, data
this.showMessage(
'api-save-error',
document.createTextNode(
editApi.info ||
( editApi && editApi.info ) ||
( data.error && data.error.info ) ||
editApi.code ||
( editApi && editApi.code ) ||
( data.error && data.error.code ) ||
'Unknown error'
),