parse_counters: skip subscribed-feeds id properly

[tt-rss.git] / js / functions.js

diff --git a/js/functions.js b/js/functions.js
index 2e9e544a9372fcba1fb58b0cfc1100e5639e9127..db18ac6dd9d8d49bdb15a6c813ce00bd0c4b3af4 100755 (executable)
--- a/js/functions.js
+++ b/js/functions.js
@@ -668,7 +668,7 @@ function hotkey_prefix_timeout() {
                        Element.hide('cmdline');
                }
 
-               setTimeout("hotkey_prefix_timeout()", 1000);
+               setTimeout(hotkey_prefix_timeout, 1000);
 
        } catch  (e) {
                exception_error("hotkey_prefix_timeout", e);
@@ -804,6 +804,15 @@ function quickAddFeed() {
                        id: "feedAddDlg",
                        title: __("Subscribe to Feed"),
                        style: "width: 600px",
+                       show_error: function(msg) {
+                               var elem = $("fadd_error_message");
+
+                               elem.innerHTML = msg;
+
+                               if (!Element.visible(elem))
+                                       new Effect.Appear(elem);
+
+                       },
                        execute: function() {
                                if (this.validate()) {
                                        console.log(dojo.objectToQuery(this.attr('value')));
@@ -811,6 +820,7 @@ function quickAddFeed() {
                                        var feed_url = this.attr('value').feed;
 
                                        Element.show("feed_add_spinner");
+                                       Element.hide("fadd_error_message");
 
                                        new Ajax.Request("backend.php", {
                                                parameters: dojo.objectToQuery(this.attr('value')),
@@ -841,10 +851,10 @@ function quickAddFeed() {
                                                                        updateFeedList();
                                                                        break;
                                                                case 2:
-                                                                       alert(__("Specified URL seems to be invalid."));
+                                                                       dialog.show_error(__("Specified URL seems to be invalid."));
                                                                        break;
                                                                case 3:
-                                                                       alert(__("Specified URL doesn't seem to contain any feeds."));
+                                                                       dialog.show_error(__("Specified URL doesn't seem to contain any feeds."));
                                                                        break;
                                                                case 4:
                                                                        feeds = rc['feeds'];
@@ -868,16 +878,16 @@ function quickAddFeed() {
 
                                                                        break;
                                                                case 5:
-                                                                       alert(__("Couldn't download the specified URL: %s").
+                                                                       dialog.show_error(__("Couldn't download the specified URL: %s").
                                                                                        replace("%s", rc['message']));
                                                                        break;
                                                                case 6:
-                                                                       alert(__("XML validation failed: %s").
+                                                                       dialog.show_error(__("XML validation failed: %s").
                                                                                        replace("%s", rc['message']));
                                                                        break;
                                                                        break;
                                                                case 0:
-                                                                       alert(__("You are already subscribed to this feed."));
+                                                                       dialog.show_error(__("You are already subscribed to this feed."));
                                                                        break;
                                                                }
 
@@ -901,7 +911,7 @@ function createNewRuleElement(parentNode, replaceNode) {
        try {
                var form = document.forms["filter_new_rule_form"];
 
-               form.reg_exp.value = form.reg_exp.value.replace(/(<([^>]+)>)/ig,"");
+               //form.reg_exp.value = form.reg_exp.value.replace(/(<([^>]+)>)/ig,"");
 
                var query = "backend.php?op=pref-filters&method=printrulename&rule="+
                        param_escape(dojo.formToJson(form));
@@ -1325,7 +1335,7 @@ function unsubscribeFeed(feed_id, title) {
                                                updateFeedList();
                                        } else {
                                                if (feed_id == getActiveFeedId())
-                                                       setTimeout("viewfeed({feed:-5})", 100);
+                                                       setTimeout(function() { viewfeed({feed:-5}) }, 100);
 
                                                if (feed_id < 0) updateFeedList();
                                        }
@@ -2053,3 +2063,10 @@ function getSelectionText() {
 
        return text.stripTags();
 }
+
+function openArticlePopup(id) {
+       window.open("backend.php?op=article&method=view&mode=raw&html=1&zoom=1&id=" + id +
+               "&csrf_token=" + getInitParam("csrf_token"),
+               "ttrss_article_popup",
+               "height=900,width=900,resizable=yes,status=no,location=no,menubar=no,directories=no,scrollbars=yes,toolbar=no");
+}
\ No newline at end of file