Merge remote-tracking branch 'upstream/master'

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

diff --git a/js/tt-rss.js b/js/tt-rss.js
index ed5e01d4bdde399cbfe48e7d847c2dc632cbd86a..1d6540dbb47e90c8b6a94551cda23d9e49bbf7e2 100644 (file)
--- a/js/tt-rss.js
+++ b/js/tt-rss.js
@@ -178,10 +178,14 @@ function search() {
 }
 
 function updateTitle() {
-       var tmp = "Tiny Tiny RSS";
+       var tmp = document.title; 
+    if (tmp.indexOf('(')>0)
+    {
+       tmp = tmp.substr(0,tmp.lastIndexOf('('));
+    }
 
        if (global_unread > 0) {
-               tmp = tmp + " (" + global_unread + ")";
+               tmp = "(" + global_unread + ") " + tmp;
        }
 
        if (window.fluid) {
@@ -942,6 +946,8 @@ function handle_rpc_json(transport, scheduled_call) {
 
 function switchPanelMode(wide) {
        try {
+               if (isCdmMode()) return;
+
                article_id = getActiveArticleId();
 
                if (wide) {