1
0
mirror of http://git.whoc.org.uk/git/password-manager.git synced 2025-10-24 09:17:35 +02:00

Merge branch 'timeout'

This commit is contained in:
Giulio Cesare Solaroli
2011-10-05 00:24:50 +01:00
2 changed files with 11 additions and 2 deletions

View File

@@ -238,6 +238,12 @@ YAHOO.extendX(Clipperz.PM.Proxy.PHP, Clipperz.PM.Proxy, {
//deferredResult.addCallback(function(res) {MochiKit.Logging.logDebug("Proxy.PHP.response - 2: " + res.responseText); return res;});
//deferredResult.addErrback(function(res) {MochiKit.Logging.logDebug("Proxy.PHP.response - ERROR: " + res); return res;});
deferredResult.addCallback(MochiKit.Async.evalJSONRequest);
deferredResult.addCallback(function (someValues) {
if (someValues['result'] == 'EXCEPTION') {
throw someValues['message'];
}
return someValues;
})
deferredResult.callback();
return deferredResult;