summaryrefslogtreecommitdiff
path: root/frontend
authorGiulio Cesare Solaroli <giulio.cesare@clipperz.com>2011-10-04 23:24:50 (UTC)
committer Giulio Cesare Solaroli <giulio.cesare@clipperz.com>2011-10-04 23:24:50 (UTC)
commit3065be1b71e4c40428cfa192de560c970ba7f8b3 (patch) (side-by-side diff)
treebd030652e7c1e1556125beeaf7f18e174ab79385 /frontend
parentc53c209c9b1e86f375aea9262fdb3170cae61ebc (diff)
parentbf22713a7251a2b32700a67456a086a283dbe33a (diff)
downloadclipperz-3065be1b71e4c40428cfa192de560c970ba7f8b3.zip
clipperz-3065be1b71e4c40428cfa192de560c970ba7f8b3.tar.gz
clipperz-3065be1b71e4c40428cfa192de560c970ba7f8b3.tar.bz2
Merge branch 'timeout'
Diffstat (limited to 'frontend') (more/less context) (ignore whitespace changes)
-rwxr-xr-xfrontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js b/frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js
index e7c2bc1..6185fd6 100755
--- a/frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js
+++ b/frontend/beta/js/Clipperz/PM/Proxy/Proxy.PHP.js
@@ -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;