Merge remote-tracking branch 'upstream/master'

diff --combined js/tt-rss.js
index 3b96566f904977494fd89cf02d573611c1f2b280,bced926745af8851121fff6a35d56f107b8037a4..c80e8737db8fb5cb54665cf46ef15373f04a31c9
--- 1/js/tt-rss.js
--- 2/js/tt-rss.js
+++ b/js/tt-rss.js
@@@ -178,11 -178,7 +178,11 @@@ 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 + ")";
@@@ -673,7 -669,15 +673,15 @@@ function hotkey_handler(e) 
                        scrollArticle(-ctr.offsetHeight/3);
                        return false;
                case "close_article":
-                       closeArticlePanel();
+                       if (isCdmMode()) {
+                               if (!getInitParam("cdm_expanded")) {
+                                       cdmCollapseArticle(false, getActiveArticleId());
+                               } else {
+                                       dismissArticle(getActiveArticleId());
+                               }
+                       } else {
+                               closeArticlePanel();
+                       }
                        return false;
                case "email_article":
                        if (typeof emailArticle != "undefined") {