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

Merge "ve.init.mw.Target: Don't go into infinite recursion on API errors"

Browse source
This commit is contained in:
jenkins-bot 2015-03-06 11:20:13 +00:00 committed by Gerrit Code Review
parent 19eacc8fe1 1656d3495e
commit a79d587125
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/ve-mw/init/ve.init.mw.Target.js
View file

@ -1171,7 +1171,7 @@ ve.init.mw.Target.prototype.tryWithPreparedCacheKey = function ( doc, options, e
data = ve.extendObject( {}, options, { format: 'json' } );
function ajaxRequest( cachekey ) {
function ajaxRequest( cachekey, isRetried ) {
var start = ve.now(),
fullEventName;
@ -1220,8 +1220,14 @@ ve.init.mw.Target.prototype.tryWithPreparedCacheKey = function ( doc, options, e
}
// This cache key is evidently bad, clear it
target.clearPreparedCacheKey();
// Try again without a cache key
return ajaxRequest( null );
if ( !isRetried ) {
// Try again without a cache key
return ajaxRequest( null, true );
} else {
// Failed twice in a row, must be some other error - let caller handle it.
// FIXME Can't just `return this` because all callers are broken.
return $.Deferred().reject( null, errorName, errorObject ).promise();
}
}
);
}