diff options
author | Andrew Dolgov <[email protected]> | 2011-02-18 12:28:03 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2011-02-18 12:28:03 +0300 |
commit | 685352116602e42b23484119f1fde5c6b7fef594 (patch) | |
tree | 71e17a483fe11ed70428a641d380f900141a1842 /functions.js | |
parent | d195055341368ca2b480a60b8a62c0c49966d272 (diff) |
fix fatalError() not working properly
Diffstat (limited to 'functions.js')
-rw-r--r-- | functions.js | 44 |
1 files changed, 25 insertions, 19 deletions
diff --git a/functions.js b/functions.js index 67d7b4f23..88365d70a 100644 --- a/functions.js +++ b/functions.js @@ -503,8 +503,6 @@ function setInitParam(key, value) { function fatalError(code, msg, ext_info) { try { - if (!ext_info) ext_info = "N/A"; - if (code == 6) { window.location.href = "tt-rss.php"; } else if (code == 5) { @@ -513,28 +511,36 @@ function fatalError(code, msg, ext_info) { if (msg == "") msg = "Unknown error"; - var ebc = $("xebContent"); - - if (ebc) { - - Element.show("dialog_overlay"); - Element.show("errorBoxShadow"); - Element.hide("xebBtn"); - - if (ext_info) { - if (ext_info.responseText) { - ext_info = ext_info.responseText; - } + if (ext_info) { + if (ext_info.responseText) { + ext_info = ext_info.responseText; } + } + + if (ERRORS && ERRORS[code] && !msg) { + msg = ERRORS[code]; + } - ebc.innerHTML = - "<div><b>Error message:</b></div>" + - "<pre>" + msg + "</pre>" + - "<div><b>Additional information:</b></div>" + - "<textarea readonly=\"1\">" + ext_info + "</textarea>"; + var content = "<div><b>Error code:</b> " + code + "</div>" + + "<p>" + msg + "</p>"; + + if (ext_info) { + content = content + "<div><b>Additional information:</b></div>" + + "<textarea style='width: 100%' readonly=\"1\">" + + ext_info + "</textarea>"; } + + var dialog = new dijit.Dialog({ + title: "Fatal error", + style: "width: 600px", + content: content}); + + dialog.show(); + } + return false; + } catch (e) { exception_error("fatalError", e); } |