diff options
Diffstat (limited to 'js')
| -rw-r--r-- | js/functions.js | 29 | ||||
| -rw-r--r-- | js/tt-rss.js | 6 | ||||
| -rw-r--r-- | js/viewfeed.js | 4 |
3 files changed, 28 insertions, 11 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/tt-rss.js b/js/tt-rss.js index eaa1f3daf..b7bb9319b 100644 --- a/js/tt-rss.js +++ b/js/tt-rss.js @@ -178,7 +178,11 @@ function search() { } function updateTitle() { - var tmp = "Tiny Tiny RSS"; + var tmp = document.title; + + if (tmp.indexOf(")") > 0) { + tmp = tmp.substr(tmp.indexOf(")") + 1); + } if (global_unread > 0) { tmp = "(" + global_unread + ") " + tmp; diff --git a/js/viewfeed.js b/js/viewfeed.js index 35c9c12a7..e32d3a990 100644 --- a/js/viewfeed.js +++ b/js/viewfeed.js @@ -1392,6 +1392,7 @@ function cdmExpandArticle(id) { Element.hide(elem); Element.show("CEXC-" + getActiveArticleId()); Element.hide(collapse); + $("RROW-" + getActiveArticleId()).removeClassName("active"); } setActiveArticleId(id); @@ -1413,6 +1414,7 @@ function cdmExpandArticle(id) { Element.show(elem); Element.hide("CEXC-" + id); Element.show(collapse); + $("RROW-" + id).addClassName("active"); } var new_offset = $("RROW-" + id).offsetTop; @@ -2044,7 +2046,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, |