Bug #18492 ยป rtehtmlarea_bugfix_7924.patch
| typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php (working copy) | ||
|---|---|---|
|
* =======================================
|
||
|
*/
|
||
|
// Preloading the pageStyle
|
||
|
$filename = trim($this->thisConfig['contentCSS']) ? trim($this->thisConfig['contentCSS']) : 'EXT:' . $this->ID . '/res/contentcss/default.css';
|
||
|
$this->TCEform->additionalCode_pre['loadCSS'] = '
|
||
|
<link rel="alternate stylesheet" type="text/css" href="' . $this->getFullFileName($filename) . '" title="HTMLArea RTE Content CSS" />';
|
||
|
// Loading the editor skin
|
||
|
$skinFilename = trim($this->thisConfig['skin']) ? trim($this->thisConfig['skin']) : 'EXT:' . $this->ID . '/htmlarea/skins/default/htmlarea.css';
|
||
|
if($this->client['BROWSER'] == 'gecko' && $this->client['VERSION'] == '1.3' && substr($skinFilename,0,4) == 'EXT:') {
|
||
| ... | ... | |
|
}
|
||
|
$this->editorCSS = $skinFilename;
|
||
|
$this->editedContentCSS = $skinDir . '/htmlarea-edited-content.css';
|
||
|
$this->TCEform->additionalCode_pre['loadCSS'] .= '
|
||
|
$this->TCEform->additionalCode_pre['loadCSS'] = '
|
||
|
<link rel="alternate stylesheet" type="text/css" href="' . $this->editedContentCSS . '" />';
|
||
|
|
||
|
// Main skin
|
||
| ... | ... | |
|
}
|
||
|
}
|
||
|
}
|
||
|
// Preloading the pageStyle
|
||
|
$filename = trim($this->thisConfig['contentCSS']) ? trim($this->thisConfig['contentCSS']) : 'EXT:' . $this->ID . '/res/contentcss/default.css';
|
||
|
$this->TCEform->additionalCode_pre['loadCSS'] .= '
|
||
|
<link rel="alternate stylesheet" type="text/css" href="' . $this->getFullFileName($filename) . '" title="HTMLArea RTE Content CSS" />';
|
||
|
|
||
|
// Loading JavaScript files and code
|
||
|
if ($this->TCEform->RTEcounter == 1) {
|
||
| typo3/sysext/rtehtmlarea/pi2/class.tx_rtehtmlarea_pi2.php (working copy) | ||
|---|---|---|
|
* LOAD JS, CSS and more
|
||
|
* =======================================
|
||
|
*/
|
||
|
// Preloading the pageStyle
|
||
|
$filename = trim($this->thisConfig['contentCSS']) ? trim($this->thisConfig['contentCSS']) : 'EXT:' . $this->ID . '/res/contentcss/default.css';
|
||
|
$additionalCode_loadCSS = '
|
||
|
<link rel="alternate stylesheet" type="text/css" href="' . $this->getFullFileName($filename) . '" title="HTMLArea RTE Content CSS" />';
|
||
|
// Loading the editor skin
|
||
|
$skinFilename = trim($this->thisConfig['skin']) ? trim($this->thisConfig['skin']) : 'EXT:' . $this->ID . '/htmlarea/skins/default/htmlarea.css';
|
||
|
if($this->client['BROWSER'] == 'gecko' && $this->client['VERSION'] == '1.3' && substr($skinFilename,0,4) == 'EXT:') {
|
||
|
if ($this->client['BROWSER'] == 'gecko' && $this->client['VERSION'] == '1.3' && substr($skinFilename,0,4) == 'EXT:') {
|
||
|
$skinFilename = 'EXT:' . $this->ID . '/htmlarea/skins/default/htmlarea.css';
|
||
|
}
|
||
|
if (substr($skinFilename,0,4) == 'EXT:') { // extension
|
||
| ... | ... | |
|
$this->editorCSS = $skinFilename;
|
||
|
$this->editedContentCSS = $skinDir . '/htmlarea-edited-content.css';
|
||
|
$additionalCode_loadCSS .= '
|
||
|
$additionalCode_loadCSS = '
|
||
|
<link rel="alternate stylesheet" type="text/css" href="' . $this->editedContentCSS . '" />';
|
||
|
|
||
|
// Main stylesheet
|
||
| ... | ... | |
|
}
|
||
|
}
|
||
|
}
|
||
|
// Preloading the pageStyle
|
||
|
$filename = trim($this->thisConfig['contentCSS']) ? trim($this->thisConfig['contentCSS']) : 'EXT:' . $this->ID . '/res/contentcss/default.css';
|
||
|
$additionalCode_loadCSS .= '
|
||
|
<link rel="alternate stylesheet" type="text/css" href="' . $this->getFullFileName($filename) . '" title="HTMLArea RTE Content CSS" />';
|
||
|
|
||
|
// Loading CSS, JavaScript files and code
|
||
|
$TSFE->additionalHeaderData['htmlArea'] = $additionalCode_loadCSS;
|
||