From b1d5af71eb83835d70bb65eb6bec5fea8c47575d Mon Sep 17 00:00:00 2001
From: Markus Klein <markus.klein@typo3.org>
Date: Thu, 19 Nov 2015 20:15:09 +0100
Subject: [PATCH] [BUGFIX] Check if popup window is there before focusing it
A popup might be blocked by the browser. Check if the window
is really available before putting focus to it to avoid a JS error.
Resolves: #71705
Releases: master
Change-Id: I30d71ac76509c622c4619857e9c19dc9c20c314a
Reviewed-on: https://review.typo3.org/44806
Reviewed-by: Helmut Hummel <helmut.hummel@typo3.org>
Reviewed-by: Valentin Despa <info@vdespa.de>
Tested-by: Helmut Hummel <helmut.hummel@typo3.org>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
---
.../backend/Resources/Public/JavaScript/LoginRefresh.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/typo3/sysext/backend/Resources/Public/JavaScript/LoginRefresh.js b/typo3/sysext/backend/Resources/Public/JavaScript/LoginRefresh.js
index 1c04cf66ca1a..3ce5481cafa6 100644
--- a/typo3/sysext/backend/Resources/Public/JavaScript/LoginRefresh.js
+++ b/typo3/sysext/backend/Resources/Public/JavaScript/LoginRefresh.js
@@ -258,7 +258,9 @@ define(['jquery', 'bootstrap'], function($) {
*/
LoginRefresh.showLoginPopup = function() {
var vHWin = window.open(LoginRefresh.loginFramesetUrl, 'relogin_' + TYPO3.configuration.uniqueID, 'height=450,width=700,status=0,menubar=0,location=1');
- vHWin.focus();
+ if (vHWin) {
+ vHWin.focus();
+ }
};
/**
--
GitLab