From b25699d2ac8c16865643949ae6598ec84cfa2289 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <machniak@kolabsys.com>
Date: Thu, 27 Jun 2019 13:07:59 +0000
Subject: [PATCH] Elastic: Improve show-content event handler

---
 skins/elastic/ui.js | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/skins/elastic/ui.js b/skins/elastic/ui.js
index ab3db1b2c..f6f51b12c 100644
--- a/skins/elastic/ui.js
+++ b/skins/elastic/ui.js
@@ -1169,26 +1169,21 @@ function rcube_elastic_ui()
         // display or reset the content frame
         var common_content_handler = function(e, href, show, title)
         {
-            if (is_mobile()) {
+            if (is_mobile() && env.frame_nav) {
                 content_frame_navigation(href, e);
             }
 
             if (show && !layout.content.is(':visible')) {
                 env.last_selected = layout.content[0];
-                screen_resize();
-
-                if (title) {
-                    title_reset(title);
-                }
             }
-            else if (!show) {
-                if (env.last_selected != last_selected && !env.content_lock) {
-                    env.last_selected = last_selected;
-                    screen_resize();
-                }
-                title_reset();
+            else if (!show && env.last_selected != last_selected && !env.content_lock) {
+                env.last_selected = last_selected;
             }
 
+            screen_resize();
+
+            title_reset(title && show ? title : null);
+
             env.content_lock = false;
         };
 
@@ -1251,7 +1246,7 @@ function rcube_elastic_ui()
                 common_list_handler(e);
             })
             .addEventListener('show-content', function(e) {
-                if (!$(e.obj).is('iframe')) {
+                if (e.obj && !$(e.obj).is('iframe')) {
                     $(e.scrollElement || e.obj).scrollTop(0);
                     if (is_mobile()) {
                         iframe_loader(e.obj);