diff options
| author | Andrew Dolgov <[email protected]> | 2013-03-22 09:49:45 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-03-22 09:49:45 +0400 |
| commit | 5defc29ff832d4c7bfb40cab0df1a34d0664409f (patch) | |
| tree | 5f68c5202b3819a22a4246adadc9d58a6a2e6ef0 /js | |
| parent | d6cb94145945a47fc843ed9c25197b1ece40cdae (diff) | |
remove PTITLE kludge; use ajax
Diffstat (limited to 'js')
| -rw-r--r-- | js/functions.js | 29 | ||||
| -rw-r--r-- | js/viewfeed.js | 2 |
2 files changed, 21 insertions, 10 deletions
diff --git a/js/functions.js b/js/functions.js index db4fedcd5..a9367da60 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1216,20 +1216,31 @@ function quickAddFilter() { var lh = dojo.connect(dialog, "onLoad", function(){ dojo.disconnect(lh); - var title = $("PTITLE-FULL-" + getActiveArticleId()); + var query = "op=rpc&method=getlinktitlebyid&id=" + getActiveArticleId(); - if (title || getActiveFeedId() || activeFeedIsCat()) { - if (title) title = title.innerHTML; + new Ajax.Request("backend.php", { + parameters: query, + onComplete: function(transport) { + var reply = JSON.parse(transport.responseText); - console.log(title + " " + getActiveFeedId()); + var title = false; - var feed_id = activeFeedIsCat() ? 'CAT:' + parseInt(getActiveFeedId()) : - getActiveFeedId(); + if (reply && reply) title = reply.title; - var rule = { reg_exp: title, feed_id: feed_id, filter_type: 1 }; + if (title || getActiveFeedId() || activeFeedIsCat()) { + + console.log(title + " " + getActiveFeedId()); + + var feed_id = activeFeedIsCat() ? 'CAT:' + parseInt(getActiveFeedId()) : + getActiveFeedId(); + + var rule = { reg_exp: title, feed_id: feed_id, filter_type: 1 }; + + addFilterRule(null, dojo.toJson(rule)); + } + + } }); - addFilterRule(null, dojo.toJson(rule)); - } }); } diff --git a/js/viewfeed.js b/js/viewfeed.js index 35c9c12a7..0a65f3f3e 100644 --- a/js/viewfeed.js +++ b/js/viewfeed.js @@ -2044,7 +2044,7 @@ function changeScore(id, pic) { function displayArticleUrl(id) { try { - var query = "op=rpc&method=getlinkbyid&id=" + param_escape(id); + var query = "op=rpc&method=getlinktitlebyid&id=" + param_escape(id); new Ajax.Request("backend.php", { parameters: query, |