From 2638c6ea6411c6b7580d85d25232b61b8c34330b Mon Sep 17 00:00:00 2001
From: Ralf Zimmermann <ralf.zimmermann@tritum.de>
Date: Mon, 11 Sep 2017 13:50:23 +0200
Subject: [PATCH] [BUGFIX] EXT:form - open the ElementBrowser in modal window
Migrate the JS ElementBrowser to the modal which was introduced with
issue #82427.
Resolves: #82443
Releases: master
Change-Id: Ib71a15a7ce9638de4eb423d896fefa47bfa15e96
Reviewed-on: https://review.typo3.org/54115
Reviewed-by: Bjoern Jacob <bjoern.jacob@tritum.de>
Tested-by: Bjoern Jacob <bjoern.jacob@tritum.de>
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Andreas Fernandez <typo3@scripting-base.de>
Tested-by: Andreas Fernandez <typo3@scripting-base.de>
---
.../Backend/FormEditor/InspectorComponent.js | 21 +++++++------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/typo3/sysext/form/Resources/Public/JavaScript/Backend/FormEditor/InspectorComponent.js b/typo3/sysext/form/Resources/Public/JavaScript/Backend/FormEditor/InspectorComponent.js
index d8fae183a22a..dcdc00450fe8 100644
--- a/typo3/sysext/form/Resources/Public/JavaScript/Backend/FormEditor/InspectorComponent.js
+++ b/typo3/sysext/form/Resources/Public/JavaScript/Backend/FormEditor/InspectorComponent.js
@@ -25,8 +25,9 @@ define(['jquery',
'TYPO3/CMS/Form/Backend/FormEditor/Helper',
'TYPO3/CMS/Backend/Icons',
'TYPO3/CMS/Backend/Notification',
+ 'TYPO3/CMS/Backend/Modal',
'TYPO3/CMS/Form/Backend/Vendor/jquery.mjs.nestedSortable'
- ], function($, Helper, Icons, Notification) {
+ ], function($, Helper, Icons, Notification, Modal) {
'use strict';
return (function($, Helper, Icons, Notification) {
@@ -358,19 +359,13 @@ define(['jquery',
*
* @param string mode
* @param string params
- * @param int width
- * @param int height
*/
- function _openTypo3WinBrowser(mode, params, width, height) {
- var openedPopupWindow, url;
- url = TYPO3.settings.FormEditor.typo3WinBrowserUrl
- + '&mode=' + mode + '&bparams=' + params;
- openedPopupWindow = window.open(
- url,
- 'Typo3WinBrowser',
- 'height=' + height + ',width=' + width + ',status=0,menubar=0,resizable=1,scrollbars=1'
- );
- openedPopupWindow.focus();
+ function _openTypo3WinBrowser(mode, params) {
+ Modal.advanced({
+ type: Modal.types.iframe,
+ content: TYPO3.settings.FormEditor.typo3WinBrowserUrl + '&mode=' + mode + '&bparams=' + params,
+ size: Modal.sizes.large
+ });
};
/**
--
GitLab