UNDO: display current feed in title (only in daemon mode for now)

diff --git a/backend.php b/backend.php
index 28026bd1b1740ccb5518394e41a95d1326382c8d..16705f47a26800a45b0e7a61739e7743a0b87bed 100644 (file)
--- a/backend.php
+++ b/backend.php
@@ -1549,7 +1549,6 @@
 
                print "<script type=\"text/javascript\">
                        document.onkeydown = hotkey_handler;
-                       if (parent.daemon_enabled) parent.updateTitle('$feed_title');
                        update_all_counters('$feed');
                </script>";
        

diff --git a/tt-rss.js b/tt-rss.js
index 1e5573f902226b98567c741639b7c28ec5fb466a..961c6df495b0c96855e779ff2f9c24dd3150c207 100644 (file)
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -342,7 +342,7 @@ function localHotkeyHandler(keycode) {
 function updateTitle(s) {
        var tmp = "Tiny Tiny RSS";
 
-       if (s != undefined) {
+       if (s && s.length > 0) {
                current_subtitle = s;
        }
 
@@ -350,7 +350,7 @@ function updateTitle(s) {
                tmp = tmp + " (" + global_unread + ")";
        }
 
-       if (current_subtitle) {
+       if (s) {
                tmp = tmp + " - " + current_subtitle;
        }