[BUGFIX] Set correct max-height for RTE 23/47123/2
authorMarius David Wieschollek <marius.typo3@mdns.eu>
Sat, 5 Mar 2016 21:18:12 +0000 (22:18 +0100)
committerAnja Leichsenring <aleichsenring@ab-softlab.de>
Sat, 5 Mar 2016 21:58:54 +0000 (22:58 +0100)
Also fixes the spelling mistake in the label of the related Backend User Settings Option

Resolves: #74336
Releases: master, 7.6
Change-Id: I21d00fd2de901eb03111581626c7efc4dec23647
Reviewed-on: https://review.typo3.org/47123
Reviewed-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring <aleichsenring@ab-softlab.de>
typo3/sysext/rtehtmlarea/Resources/Private/Language/locallang.xlf
typo3/sysext/rtehtmlarea/Resources/Private/Language/locallang_csh.xlf
typo3/sysext/rtehtmlarea/Resources/Public/JavaScript/HTMLArea/Editor/Framework.js

index db30988..c61d40b 100644 (file)
@@ -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>
index c4ed499..849a55e 100644 (file)
@@ -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>
index 07bb064..af929e3 100644 (file)
@@ -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