init params debugging: support objects etc

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

diff --git a/js/functions.js b/js/functions.js
index 43fae715b633fb0e70db9a8cd01f10baaa13f8bf..46ab7a584cb2b6b39d52e4c273bf31c0d55c4679 100644 (file)
--- a/js/functions.js
+++ b/js/functions.js
@@ -47,6 +47,8 @@ function exception_error(location, e, ext_info) {
                if (ext_info) {
                        if (ext_info.responseText) {
                                ext_info = ext_info.responseText;
+                       } else {
+                               ext_info = JSON.stringify(ext_info);
                        }
                }
 
@@ -104,13 +106,15 @@ function exception_error(location, e, ext_info) {
                        title: "Unhandled exception",
                        style: "width: 600px",
                        report: function() {
-                               if (confirm(__("Are you sure to report this exception to tt-rss.org? The report will include your browser information. Your IP would be saved in the database."))) {
+                               if (confirm(__("Are you sure to report this exception to tt-rss.org? The report will include information about your web browser and tt-rss configuration. Your IP will be saved in the database."))) {
 
                                        document.forms['exceptionForm'].params.value = $H({
                                                browserName: navigator.appName,
                                                browserVersion: navigator.appVersion,
                                                browserPlatform: navigator.platform,
                                                browserCookies: navigator.cookieEnabled,
+                                               ttrssVersion: __ttrss_version,
+                                               initParams: JSON.stringify(init_params),
                                        }).toQueryString();
 
                                        document.forms['exceptionForm'].submit();
@@ -829,7 +833,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'];
 
@@ -1287,10 +1298,8 @@ function backend_sanity_check_callback(transport) {
                        console.log('reading init-params...');
 
                        for (k in params) {
-                               var v = params[k];
-                               console.log("IP: " + k + " => " + v);
-
-                               if (k == "label_base_index") _label_base_index = parseInt(v);
+                               console.log("IP: " + k + " => " + JSON.stringify(params[k]));
+                               if (k == "label_base_index") _label_base_index = parseInt(params[k]);
                        }
 
                        init_params = params;