Revert "exception handler: remove report to tt-rss.org"

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

diff --git a/js/functions.js b/js/functions.js
index 8442e1c9fc0f5039d3e6c1227df57805f15f7062..1ad15fcc672a2d7c3c45bbdc9273f6d91f2ccdae 100644 (file)
--- a/js/functions.js
+++ b/js/functions.js
@@ -226,13 +226,13 @@ function notify_real(msg, no_hide, n_type) {
                no_hide = true;
        } else if (n_type == 3) {
                n.className = "notify error";
-               msg = "<span><img src='images/sign_excl.svg'></span>" + msg;
+               msg = "<span><img src='images/alert.png'></span>" + msg;
        } else if (n_type == 4) {
                n.className = "notify info";
-               msg = "<span><img src='images/sign_info.svg'></span>" + msg;
+               msg = "<span><img src='images/information.png'></span>" + msg;
        }
 
-       msg += " <span><img src=\"images/close_notify.svg\" class=\"close\" title=\"" +
+       msg += " <span><img src=\"images/cross.png\" class=\"close\" title=\"" +
                __("Click to close") + "\" onclick=\"notify('')\"></span>";
 
 //     msg = "<img src='images/live_com_loading.gif'> " + msg;
@@ -829,7 +829,14 @@ function quickAddFeed() {
                                                onComplete: function(transport) {
                                                        try {
 
-                                                               var reply = JSON.parse(transport.responseText);
+                                                               try {
+                                                                       var reply = JSON.parse(transport.responseText);
+                                                               } catch (e) {
+                                                                       Element.hide("feed_add_spinner");
+                                                                       alert(__("Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."));
+                                                                       console.log('quickAddFeed, backend returned:' + transport.responseText);
+                                                                       return;
+                                                               }
 
                                                                var rc = reply['result'];
 
@@ -854,6 +861,8 @@ function quickAddFeed() {
                                                                case 4:
                                                                        feeds = rc['feeds'];
 
+                                                                       Element.show("fadd_multiple_notify");
+
                                                                        var select = dijit.byId("feedDlg_feedContainerSelect");
 
                                                                        while (select.getOptions().length > 0)
@@ -1148,33 +1157,48 @@ function quickAddFilter() {
                        href: query});
 
                if (!inPreferences()) {
+                       var selectedText = getSelectionText();
+
                        var lh = dojo.connect(dialog, "onLoad", function(){
                                dojo.disconnect(lh);
 
-                               var query = "op=rpc&method=getlinktitlebyid&id=" + getActiveArticleId();
+                               if (selectedText != "") {
 
-                               new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) {
-                                       var reply = JSON.parse(transport.responseText);
+                                       var feed_id = activeFeedIsCat() ? 'CAT:' + parseInt(getActiveFeedId()) :
+                                               getActiveFeedId();
+
+                                       var rule = { reg_exp: selectedText, feed_id: feed_id, filter_type: 1 };
+
+                                       addFilterRule(null, dojo.toJson(rule));
 
-                                       var title = false;
+                               } else {
+
+                                       var query = "op=rpc&method=getlinktitlebyid&id=" + getActiveArticleId();
 
-                                       if (reply && reply) title = reply.title;
+                                       new Ajax.Request("backend.php", {
+                                       parameters: query,
+                                       onComplete: function(transport) {
+                                               var reply = JSON.parse(transport.responseText);
 
-                                       if (title || getActiveFeedId() || activeFeedIsCat()) {
+                                               var title = false;
 
-                                               console.log(title + " " + getActiveFeedId());
+                                               if (reply && reply) title = reply.title;
 
-                                               var feed_id = activeFeedIsCat() ? 'CAT:' + parseInt(getActiveFeedId()) :
-                                                       getActiveFeedId();
+                                               if (title || getActiveFeedId() || activeFeedIsCat()) {
 
-                                               var rule = { reg_exp: title, feed_id: feed_id, filter_type: 1 };
+                                                       console.log(title + " " + getActiveFeedId());
 
-                                               addFilterRule(null, dojo.toJson(rule));
-                                       }
+                                                       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));
+                                               }
+
+                                       } });
+
+                               }
 
                        });
                }
@@ -1269,16 +1293,17 @@ function backend_sanity_check_callback(transport) {
                if (params) {
                        console.log('reading init-params...');
 
-                       if (params) {
-                               for (k in params) {
-                                       var v = params[k];
-                                       console.log("IP: " + k + " => " + v);
+                       for (k in params) {
+                               var v = params[k];
+                               console.log("IP: " + k + " => " + v);
 
-                                       if (k == "label_base_index") _label_base_index = parseInt(v);
-                               }
+                               if (k == "label_base_index") _label_base_index = parseInt(v);
                        }
 
                        init_params = params;
+
+                       // PluginHost might not be available on non-index pages
+                       window.PluginHost && PluginHost.run(PluginHost.HOOK_PARAMS_LOADED, init_params);
                }
 
                sanity_check_done = true;
@@ -1933,3 +1958,25 @@ function feed_to_label_id(feed) {
        return _label_base_index - 1 + Math.abs(feed);
 }
 
+// http://stackoverflow.com/questions/6251937/how-to-get-selecteduser-highlighted-text-in-contenteditable-element-and-replac
+
+function getSelectionText() {
+       var text = "";
+
+       if (typeof window.getSelection != "undefined") {
+               var sel = window.getSelection();
+               if (sel.rangeCount) {
+                       var container = document.createElement("div");
+                       for (var i = 0, len = sel.rangeCount; i < len; ++i) {
+                               container.appendChild(sel.getRangeAt(i).cloneContents());
+                       }
+                       text = container.innerHTML;
+               }
+       } else if (typeof document.selection != "undefined") {
+               if (document.selection.type == "Text") {
+                       text = document.selection.createRange().textText;
+               }
+       }
+
+       return text.stripTags();
+}