diff options
author | Andrew Dolgov <[email protected]> | 2010-09-13 15:14:18 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2010-09-13 15:14:18 +0400 |
commit | 4a3da1c8eff80c15f66029c007f83e002e5b3260 (patch) | |
tree | a6c2779b1fe4a7f2fa007104f709d2ec969027b4 /prefs.js | |
parent | 134477f21deb617d06245635b081e548058922da (diff) |
unify backend sanity checking code
Diffstat (limited to 'prefs.js')
-rw-r--r-- | prefs.js | 62 |
1 files changed, 4 insertions, 58 deletions
@@ -4,7 +4,6 @@ var active_tab = false; var init_params = new Array(); var caller_subop = false; -var sanity_check_done = false; var hotkey_prefix = false; var hotkey_prefix_pressed = false; @@ -12,6 +11,9 @@ var color_picker_active = false; var selection_disabled = false; var mouse_is_down = false; +var db = false; +var store = false; + function feedlist_callback2(transport) { try { @@ -1105,62 +1107,6 @@ function selectTab(id, noupdate, subop) { } } -function backend_sanity_check_callback2(transport) { - - try { - - if (sanity_check_done) { - fatalError(11, "Sanity check request received twice. This can indicate "+ - "presence of Firebug or some other disrupting extension. "+ - "Please disable it and try again."); - return; - } - - if (!transport.responseXML) { - fatalError(3, "Sanity Check: Received reply is not XML", - transport.responseText); - return; - } - - var reply = transport.responseXML.firstChild.firstChild; - - if (!reply) { - fatalError(3, "Sanity Check: Invalid RPC reply", transport.responseText); - return; - } - - var error_code = reply.getAttribute("error-code"); - - if (error_code && error_code != 0) { - return fatalError(error_code, reply.getAttribute("error-msg")); - } - - console.log("sanity check ok"); - - var params = reply.nextSibling; - - if (params) { - console.log('reading init-params...'); - var param = params.firstChild; - - while (param) { - var k = param.getAttribute("key"); - var v = param.getAttribute("value"); - console.log(k + " => " + v); - init_params[k] = v; - param = param.nextSibling; - } - } - - sanity_check_done = true; - - init_second_stage(); - - } catch (e) { - exception_error("backend_sanity_check_callback", e); - } -} - function init_second_stage() { try { @@ -1216,7 +1162,7 @@ function init() { new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { - backend_sanity_check_callback2(transport); + backend_sanity_check_callback(transport); } }); } catch (e) { |