]> git.wh0rd.org - tt-rss.git/blobdiff - functions.js
fix fatalError() not working properly
[tt-rss.git] / functions.js
index 11f1f4e0a92c9286baa822457c23ea0728dc3849..88365d70a555df4bbde50c7e37eba40f487d22de 100644 (file)
@@ -41,10 +41,6 @@ function exception_error(location, e, ext_info) {
                content += "<div><b>Stack trace:</b></div>" +
                        "<textarea readonly=\"1\">" + e.stack + "</textarea>";
 
-//             content += "<div style='text-align : center'>" +
-//                     "<button onclick=\"closeInfoBox()\">" +
-//                     "Close this window" + "</button></div>";
-
                content += "</div>";
 
                // TODO: add code to automatically report errors to tt-rss.org
@@ -423,21 +419,6 @@ function displayDlg(id, param, callback) {
        return false;
 }
 
-function infobox_submit_callback2(transport) {
-       closeInfoBox();
-
-       try {
-               // called from prefs, reload tab
-               if (typeof active_tab != 'undefined' && active_tab) {
-                       selectTab(active_tab, false);
-               }
-       } catch (e) { }
-
-       if (transport.responseText) {
-               notify_info(transport.responseText);
-       }
-}
-
 function infobox_callback2(transport) {
        try {
                var dialog = false;
@@ -490,62 +471,6 @@ function infobox_callback2(transport) {
        }
 }
 
-function createFilter() {
-
-       try {
-
-               var form = document.forms['filter_add_form'];
-               var reg_exp = form.reg_exp.value;
-       
-               if (reg_exp == "") {
-                       alert(__("Can't add filter: nothing to match on."));
-                       return false;
-               }
-
-               var query = "?op=rpc&subop=verifyRegexp&reg_exp=" + param_escape(reg_exp);
-
-               notify_progress("Verifying regular expression...");
-
-               new Ajax.Request("backend.php", {
-                               parameters: query,
-                               onComplete: function(transport) {
-                                       handle_rpc_reply(transport);
-
-                                       var response = transport.responseXML;
-
-                                       if (response) {
-                                               var s = response.getElementsByTagName("status")[0].firstChild.nodeValue;
-       
-                                               notify('');
-
-                                               if (s == "INVALID") {
-                                                       alert("Match regular expression seems to be invalid.");
-                                                       return;
-                                               } else {
-
-                                                       var query = Form.serialize("filter_add_form");
-                                               
-                                                       // we can be called from some other tab in Prefs                
-                                                       if (typeof active_tab != 'undefined' && active_tab) {
-                                                               active_tab = "filterConfig";
-                                                       }
-                                               
-                                                       new Ajax.Request("backend.php?" + query, {
-                                                               onComplete: function (transport) {
-                                                                       infobox_submit_callback2(transport);
-                                                               } });
-                                                       
-                                                       return true;
-                                               }
-                                       }
-
-                       } });
-
-       } catch (e) {
-               exception_error("createFilter", e);
-       }
-}
-
 function filterCR(e, f)
 {
      var key;
@@ -578,8 +503,6 @@ function setInitParam(key, value) {
 function fatalError(code, msg, ext_info) {
        try {   
 
-               if (!ext_info) ext_info = "N/A";
-
                if (code == 6) {
                        window.location.href = "tt-rss.php";                    
                } else if (code == 5) {
@@ -588,28 +511,36 @@ function fatalError(code, msg, ext_info) {
        
                        if (msg == "") msg = "Unknown error";
 
-                       var ebc = $("xebContent");
-       
-                       if (ebc) {
-       
-                               Element.show("dialog_overlay");
-                               Element.show("errorBoxShadow");
-                               Element.hide("xebBtn");
-
-                               if (ext_info) {
-                                       if (ext_info.responseText) {
-                                               ext_info = ext_info.responseText;
-                                       }
+                       if (ext_info) {
+                               if (ext_info.responseText) {
+                                       ext_info = ext_info.responseText;
                                }
+                       }
+
+                       if (ERRORS && ERRORS[code] && !msg) {
+                               msg = ERRORS[code];
+                       }
        
-                               ebc.innerHTML = 
-                                       "<div><b>Error message:</b></div>" +
-                                       "<pre>" + msg + "</pre>" +
-                                       "<div><b>Additional information:</b></div>" +
-                                       "<textarea readonly=\"1\">" + ext_info + "</textarea>";
+                       var content = "<div><b>Error code:</b> " + code + "</div>" +
+                               "<p>" + msg + "</p>";
+
+                       if (ext_info) {
+                               content = content + "<div><b>Additional information:</b></div>" +
+                                       "<textarea style='width: 100%' readonly=\"1\">" + 
+                                       ext_info + "</textarea>";
                        }
+
+                       var dialog = new dijit.Dialog({
+                               title: "Fatal error",
+                               style: "width: 600px",
+                               content: content});
+
+                       dialog.show();
+
                }
 
+               return false;
+
        } catch (e) {
                exception_error("fatalError", e);
        }
@@ -682,19 +613,15 @@ function filterDlgCheckDate() {
                        parameters: query,
                        onComplete: function(transport) { 
 
-                               if (transport.responseXML) {
-                                       var result = transport.responseXML.getElementsByTagName("result")[0];
+                               var reply = JSON.parse(transport.responseText);
 
-                                       if (result && result.firstChild) {
-                                               if (result.firstChild.nodeValue == "1") {
-                                                       alert(__("Date syntax appears to be correct."));
-                                                       return;
-                                               }
-                                       }
+                               if (reply['result'] == true) {
+                                       alert(__("Date syntax appears to be correct."));
+                                       return;
+                               } else {
+                                       alert(__("Date syntax is incorrect."));
                                }
 
-                               alert(__("Date syntax is incorrect."));
-
                        } });
 
 
@@ -740,24 +667,6 @@ function remove_splash() {
        }
 }
 
-/* function getSelectedFeedsFromBrowser() {
-
-       var list = $$("#browseFeedList li[id*=FBROW]");
-
-       var selected = new Array();
-
-       list.each(function(child) {     
-               var id = child.id.replace("FBROW-", "");
-
-               if (child.hasClassName('Selected')) {
-                       selected.push(id);
-               }       
-       });
-
-       return selected;
-} */
-
-
 function transport_error_check(transport) {
        try {
                if (transport.responseXML) {
@@ -922,7 +831,7 @@ function addLabel(select, callback) {
                                        if (callback) {
                                                callback(transport);
                                        } else if (inPreferences()) {
-                                               infobox_submit_callback2(transport);
+                                               updateLabelList();
                                        } else {
                                                updateFeedList();
                                        }
@@ -958,15 +867,10 @@ function quickAddFeed() {
                                                parameters: dojo.objectToQuery(this.attr('value')),
                                                onComplete: function(transport) { 
                                                        try {
+
+                                                               var reply = JSON.parse(transport.responseText);
                                
-                                                               if (!transport.responseXML) {
-                                                                       console.log(transport.responseText);
-                                                                       alert(__("Server error while trying to subscribe to specified feed."));
-                                                                       return;
-                                                               }
-                               
-                                                               var result = transport.responseXML.getElementsByTagName('result')[0];
-                                                               var rc = parseInt(result.getAttribute('code'));
+                                                               var rc = parseInt(reply['result']);
                                        
                                                                notify('');
 
@@ -977,11 +881,7 @@ function quickAddFeed() {
                                                                        dialog.hide();
                                                                        notify_info(__("Subscribed to %s").replace("%s", feed_url));
                                        
-                                                                       if (inPreferences()) {
-                                                                               updateFeedList();
-                                                                       } else {
-                                                                               setTimeout('updateFeedList(false, false)', 50);
-                                                                       }
+                                                                       updateFeedList();
                                                                        break;
                                                                case 2:
                                                                        alert(__("Specified URL seems to be invalid."));
@@ -996,16 +896,11 @@ function quickAddFeed() {
                                                                                parameters: 'op=rpc&subop=extractfeedurls&url=' + param_escape(feed_url),
                                                                                onComplete: function(transport, dialog, feed_url) {
 
-                                                                                       if (!transport.responseXML) {
-                                                                                               console.log(transport.responseText);
-                                                                                               alert(__("Server error while trying to query feed URLs."));
-                                                                                               return;
-                                                                                       }
-       
                                                                                        notify('');
 
-                                                                                       var result = transport.responseXML.getElementsByTagName('urls')[0];
-                                                                                       var feeds = JSON.parse(result.firstChild.nodeValue);
+                                                                                       var reply = JSON.parse(transport.responseText);
+
+                                                                                       var feeds = reply['urls'];
 
                                                                                        console.log(transport.responseText);
 
@@ -1073,15 +968,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 {
@@ -1129,7 +1021,8 @@ function unsubscribeFeed(feed_id, title) {
                                        if (inPreferences()) {
                                                updateFeedList();                               
                                        } else {
-                                               dlg_frefresh_callback(transport, feed_id);
+                                               if (feed_id == getActiveFeedId())
+                                                       setTimeout("viewfeed(-5)", 100);
                                        }
 
                                } });
@@ -1272,14 +1165,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(/\&amp;key=.*$/, 
                                                                "&amp;key=" + new_link);
 
@@ -1469,12 +1361,8 @@ function editFeed(feed, event) {
                                                parameters: dojo.objectToQuery(dialog.attr('value')),
                                                onComplete: function(transport) {
                                                        dialog.hide();
-                                                       if (inPreferences()) {
-                                                               updateFeedList();
-                                                       } else {
-                                                               notify('');
-                                                               dlg_frefresh_callback(transport);
-                                                       }
+                                                       notify('');
+                                                       updateFeedList();
                                        }})
                                }
                        },
@@ -1532,16 +1420,8 @@ function feedBrowser() {
                                        new Ajax.Request("backend.php", {
                                                parameters: query,
                                                onComplete: function(transport) { 
-               
-                                                       var nf = transport.responseXML.getElementsByTagName('num-feeds')[0];
-                                                       var nf_value = nf.getAttribute("value");
-               
-                                                       notify_info(__("Subscribed to %d feed(s).").replace("%d", nf_value));
-               
                                                        if (inPreferences()) {
                                                                updateFeedList();
-                                                       } else {
-                                                               setTimeout('updateFeedList(false, false)', 50);
                                                        }
                                                } });
                
@@ -1563,17 +1443,19 @@ function feedBrowser() {
                                                Element.hide('feed_browser_spinner');
                
                                                var c = $("browseFeedList");
-                                               var r = transport.responseXML.getElementsByTagName("content")[0];
-                                               var nr = transport.responseXML.getElementsByTagName("num-results")[0];
-                                               var mode = transport.responseXML.getElementsByTagName("mode")[0];
+
+                                               var reply = JSON.parse(transport.responseText);
+
+                                               var r = reply['content'];
+                                               var mode = reply['mode'];
                
                                                if (c && r) {
-                                                       c.innerHTML = r.firstChild.nodeValue;
+                                                       c.innerHTML = r;
                                                }
                
                                                dojo.parser.parse("browseFeedList");
                
-                                               if (parseInt(mode.getAttribute("value")) == 2) {
+                                               if (mode == 2) {
                                                        Element.show(dijit.byId('feed_archive_remove').domNode);
                                                } else {
                                                        Element.hide(dijit.byId('feed_archive_remove').domNode);