From 91d16ff193f36a47aee09767faa3487e30915468 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 29 Nov 2010 16:44:50 +0300 Subject: rpc: mark silent methods, rework verifyRegexp to use JSON --- functions.js | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) (limited to 'functions.js') diff --git a/functions.js b/functions.js index 615d59fc3..91318b020 100644 --- a/functions.js +++ b/functions.js @@ -962,15 +962,12 @@ function quickAddFilter() { new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { - handle_rpc_reply(transport); - var response = transport.responseXML; + var reply = JSON.parse(transport.responseText); - if (response) { - var s = response.getElementsByTagName("status")[0].firstChild.nodeValue; - + if (reply) { notify(''); - if (s == "INVALID") { + if (!reply['status']) { alert("Match regular expression seems to be invalid."); return; } else { @@ -1162,14 +1159,13 @@ function genUrlChangeKey(feed, is_cat) { new Ajax.Request("backend.php", { parameters: query, onComplete: function(transport) { - var new_link = transport.responseXML.getElementsByTagName("link")[0]; + var reply = JSON.parse(transport.responseText); + var new_link = reply.link; var e = $('gen_feed_url'); if (new_link) { - new_link = new_link.firstChild.nodeValue; - e.innerHTML = e.innerHTML.replace(/\&key=.*$/, "&key=" + new_link); -- cgit v1.2.3-54-g00ecf