better feed debugger ui for f D

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

diff --git a/js/tt-rss.js b/js/tt-rss.js
index df41a9cc54dc70066c113793a9fd730b574e03c2..602c953b1ed0f0955cf29902ddbe2ef9f6161040 100644 (file)
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -422,10 +422,12 @@ function init() {
                                quickAddFeed();
                };
                hotkey_actions["feed_debug_update"] = function() {
-                               window.open("backend.php?op=feeds&method=view&feed=" + getActiveFeedId() +
-                                       "&view_mode=adaptive&order_by=default&update=&m=ForceUpdate&cat=" +
-                                       activeFeedIsCat() + "&DevForceUpdate=1&debug=1&xdebug=1&csrf_token=" +
-                                       getInitParam("csrf_token"));
+                       if (!activeFeedIsCat() && parseInt(getActiveFeedId()) > 0) {
+                               window.open("backend.php?op=feeds&method=update_debugger&feed_id=" + getActiveFeedId() +
+                               "&csrf_token=" + getInitParam("csrf_token"));
+                       } else {
+                               alert("You can't debug this kind of feed.");
+                       }
                };
                hotkey_actions["feed_edit"] = function() {
                                if (activeFeedIsCat())
@@ -512,6 +514,8 @@ function init() {
                                        setCookie("ttrss_ci_height", 0);
 
                                        switchPanelMode(_widescreen_mode);
+                               } else {
+                                       alert(__("Widescreen is not available in combined mode."));
                                }
                };
                hotkey_actions["help_dialog"] = function() {
@@ -711,6 +715,8 @@ function quickMenuGo(opid) {
                                setCookie("ttrss_ci_height", 0);
 
                                switchPanelMode(_widescreen_mode);
+                       } else {
+                               alert(__("Widescreen is not available in combined mode."));
                        }
                        break;
                case "qmcHKhelp":
@@ -763,14 +769,14 @@ function parse_runtime_info(data) {
                }
 
                if (k == "daemon_is_running" && v != 1) {
-                       notify_error("<span onclick=\"javascript:explainError(1)\">Update daemon is not running.</span>", true);
+                       notify_error("<span onclick=\"explainError(1)\">Update daemon is not running.</span>", true);
                        return;
                }
 
                if (k == "update_result") {
                        var updatesIcon = dijit.byId("updatesIcon").domNode;
 
-                       if (v != "") {
+                       if (v) {
                                Element.show(updatesIcon);
                        } else {
                                Element.hide(updatesIcon);
@@ -778,7 +784,7 @@ function parse_runtime_info(data) {
                }
 
                if (k == "daemon_stamp_ok" && v != 1) {
-                       notify_error("<span onclick=\"javascript:explainError(3)\">Update daemon is not updating feeds.</span>", true);
+                       notify_error("<span onclick=\"explainError(3)\">Update daemon is not updating feeds.</span>", true);
                        return;
                }