[BUGFIX] Remove Firefox CSS loading hack in RTE editor 28/50428/2
authorMarkus Klein <markus.klein@typo3.org>
Fri, 28 Oct 2016 22:17:31 +0000 (00:17 +0200)
committerAndreas Fernandez <typo3@scripting-base.de>
Sun, 30 Oct 2016 17:14:05 +0000 (18:14 +0100)
Remove a totally outdated Firefox hack for loading CSS files.

Resolves: #78492
Releases: master
Change-Id: I5dad91d01e212927d906b0548471d23137d58c29
Reviewed-on: https://review.typo3.org/50428
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Josef Glatz <josef.glatz@typo3.org>
Reviewed-by: Wouter Wolters <typo3@wouterwolters.nl>
Tested-by: Wouter Wolters <typo3@wouterwolters.nl>
Reviewed-by: Andreas Fernandez <typo3@scripting-base.de>
Tested-by: Andreas Fernandez <typo3@scripting-base.de>
typo3/sysext/rtehtmlarea/Resources/Public/JavaScript/HTMLArea/Editor/Iframe.js

index bfb5e12..0332500 100644 (file)
@@ -264,9 +264,7 @@ define(['TYPO3/CMS/Rtehtmlarea/HTMLArea/UserAgent/UserAgent',
                                link0 = this.document.createElement('link');
                                link0.rel = 'stylesheet';
                                link0.type = 'text/css';
-                                       // Firefox 3.0.1 does not apply the base URL while Firefox 3.6.8 does so. Do not know in what version this was fixed.
-                                       // Therefore, for versions before 3.6.8, we prepend the url with the base, if the url is not absolute
-                               link0.href = ((UserAgent.isGecko && navigator.productSub < 2010072200 && !/^http(s?):\/{2}/.test(this.config.editedContentStyle)) ? this.config.baseURL : '') + this.config.editedContentStyle;
+                               link0.href = this.config.editedContentStyle;
                                head.appendChild(link0);
                                this.getEditor().appendToLog('HTMLArea.Iframe', 'createHead', 'Skin CSS set to: ' + link0.href, 'info');
                        }
@@ -276,7 +274,7 @@ define(['TYPO3/CMS/Rtehtmlarea/HTMLArea/UserAgent/UserAgent',
                                var link = this.document.createElement('link');
                                link.rel = 'stylesheet';
                                link.type = 'text/css';
-                               link.href = ((UserAgent.isGecko && navigator.productSub < 2010072200 && !/^https?:\/{2}/.test(pageStyle)) ? this.config.baseURL : '') + pageStyle;
+                               link.href = pageStyle;
                                head.appendChild(link);
                                this.getEditor().appendToLog('HTMLArea.Iframe', 'createHead', 'Content CSS set to: ' + link.href, 'info');
                        }