diff options
author | Andrew Dolgov <[email protected]> | 2006-03-31 06:18:55 +0100 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2006-03-31 06:18:55 +0100 |
commit | af106b0ebe0b34189a83bbfb64e9c9ace044a273 (patch) | |
tree | 821e7cefa3f9011626bc51a34bc7209c445e1036 /tt-rss.js | |
parent | 6e7f8d269e3c84807072607edc765d6c0f72712c (diff) |
better fatal error handling by frontend (remove error.php)
Diffstat (limited to 'tt-rss.js')
-rw-r--r-- | tt-rss.js | 29 |
1 files changed, 25 insertions, 4 deletions
@@ -124,7 +124,7 @@ function refetch_callback() { var error_code = reply.getAttribute("error-code"); if (error_code && error_code != 0) { - return fatalError(error_code); + return fatalError(error_code, reply.getAttribute("error-msg")); } var f_document = window.frames["feeds-frame"].document; @@ -153,21 +153,21 @@ function backend_sanity_check_callback() { try { if (!xmlhttp.responseXML) { - fatalError(3, "D001: " + xmlhttp.responseText); + fatalError(3, "[D001, Reply is not XML]: " + xmlhttp.responseText); return; } var reply = xmlhttp.responseXML.firstChild; if (!reply) { - fatalError(3, "D002: " + xmlhttp.responseText); + fatalError(3, "[D002, Invalid RPC reply]: " + xmlhttp.responseText); return; } var error_code = reply.getAttribute("error-code"); if (error_code && error_code != 0) { - return fatalError(error_code); + return fatalError(error_code, reply.getAttribute("error-msg")); } debug("sanity check ok"); @@ -697,3 +697,24 @@ function debug(msg) { c.innerHTML = "<li>[" + ts + "] " + msg + "</li>" + c.innerHTML; } } + +function fatalError(code, message) { +/* if (!params) { + window.location = "error.php?c=" + param_escape(code); + } else { + window.location = "error.php?c=" + param_escape(code) + + "&p=" + param_escape(params); + } */ + + try { + var fe = document.getElementById("fatal_error"); + var fc = document.getElementById("fatal_error_msg"); + + fc.innerHTML = "Code " + code + ": " + message; + + fe.style.display = "block"; + + } catch (e) { + exception_error("fatalError", e); + } +} |