From 8f8a173906c785c6f1c2742eb75f651de5c26306 Mon Sep 17 00:00:00 2001
From: Marius David Wieschollek <marius.typo3@mdns.eu>
Date: Sat, 5 Mar 2016 22:18:12 +0100
Subject: [PATCH] [BUGFIX] Set correct max-height for RTE
Also fixes the spelling mistake in the label of the related Backend User Settings Option
Resolves: #74336
Releases: master
Change-Id: I21d00fd2de901eb03111581626c7efc4dec23647
Reviewed-on: https://review.typo3.org/47121
Reviewed-by: Jo Hasenau <info@cybercraft.de>
Tested-by: Jo Hasenau <info@cybercraft.de>
Reviewed-by: Andreas Bouche <andreas.bouche@flagbit.de>
Tested-by: Andreas Bouche <andreas.bouche@flagbit.de>
Reviewed-by: Bjoern Jacob <bjoern.jacob@tritum.de>
Tested-by: Bjoern Jacob <bjoern.jacob@tritum.de>
Reviewed-by: Jan Helke <typo3@helke.de>
Tested-by: Jan Helke <typo3@helke.de>
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
---
.../sysext/rtehtmlarea/Resources/Private/Language/locallang.xlf | 2 +-
.../rtehtmlarea/Resources/Private/Language/locallang_csh.xlf | 2 +-
.../Resources/Public/JavaScript/HTMLArea/Editor/Framework.js | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/typo3/sysext/rtehtmlarea/Resources/Private/Language/locallang.xlf b/typo3/sysext/rtehtmlarea/Resources/Private/Language/locallang.xlf
index db30988bb3ad..c61d40b55ea8 100644
--- a/typo3/sysext/rtehtmlarea/Resources/Private/Language/locallang.xlf
+++ b/typo3/sysext/rtehtmlarea/Resources/Private/Language/locallang.xlf
@@ -52,7 +52,7 @@
<source>Make RTE resizable</source>
</trans-unit>
<trans-unit id="rteMaxHeight">
- <source>Maximal height of resizable RTE in pixels</source>
+ <source>Maximal height of resizeable RTE in pixels</source>
</trans-unit>
<trans-unit id="deprecatedPropertyMessage">
<source>Page TSConfig property "%1$s" used on page id #%4$s is DEPRECATED and will be removed in TYPO3 %3$s. Use "%2$s" instead.</source>
diff --git a/typo3/sysext/rtehtmlarea/Resources/Private/Language/locallang_csh.xlf b/typo3/sysext/rtehtmlarea/Resources/Private/Language/locallang_csh.xlf
index c4ed49933a46..849a55e54733 100644
--- a/typo3/sysext/rtehtmlarea/Resources/Private/Language/locallang_csh.xlf
+++ b/typo3/sysext/rtehtmlarea/Resources/Private/Language/locallang_csh.xlf
@@ -56,7 +56,7 @@ The value you set should allow sufficient height for the tool bar, the editing a
<source>This option will make RTE-enabled fields resizable. A resize handle will appear at the bottom right corner of the RTE.</source>
</trans-unit>
<trans-unit id="rteMaxHeight.alttitle">
- <source>Maximal height of resizable RTE in pixels</source>
+ <source>Maximal height of resizeable RTE in pixels</source>
</trans-unit>
<trans-unit id="rteMaxHeight.description">
<source>The value you set should allow sufficient height for the tool bar, the editing area and the status bar of the RTE. Default value is 2000.</source>
diff --git a/typo3/sysext/rtehtmlarea/Resources/Public/JavaScript/HTMLArea/Editor/Framework.js b/typo3/sysext/rtehtmlarea/Resources/Public/JavaScript/HTMLArea/Editor/Framework.js
index 07bb0641460e..af929e3c924a 100644
--- a/typo3/sysext/rtehtmlarea/Resources/Public/JavaScript/HTMLArea/Editor/Framework.js
+++ b/typo3/sysext/rtehtmlarea/Resources/Public/JavaScript/HTMLArea/Editor/Framework.js
@@ -217,7 +217,7 @@ define(['TYPO3/CMS/Rtehtmlarea/HTMLArea/UserAgent/UserAgent',
// The same is true in Opera 26
if (Util.testCssPropertySupport(this.getEl(), 'resize', 'both') && typeof MutationObserver === 'function' && !UserAgent.isWebKit && !UserAgent.isOpera) {
this.getEl().style['resize'] = 'both';
- this.getEl().style['maxHeight'] = this.maxHeight;
+ this.getEl().style['maxHeight'] = this.maxHeight + 'px';
// WebKit adds scollbars
this.getEl().style['overflow'] = UserAgent.isWebKit ? 'hidden' : 'auto';
// For WebKit, we need to reset the resize property set by default on textareas and iframes
--
GitLab