Skip to content
Snippets Groups Projects

Master

Merged Master
mhuber84/tinymce4_rte:master into master
Merged Marco Huber requested to merge mhuber84/tinymce4_rte:master into master
Compare
and
+ 77
− 96
Compare changes
  • Side-by-side
  • Inline
Files
Classes/Controller/BrowseLinksController.php
+ 28
− 29
@@ -177,13 +177,15 @@ class BrowseLinksController extends AbstractLinkBrowserController {
$this->bparams = implode('|', $pArr);
$this->contentLanguageService->init($this->contentTypo3Language);
$this->buttonConfig = isset($this->RTEProperties['default.']['buttons.']['link.'])
? $this->RTEProperties['default.']['buttons.']['link.']
: [];
$RTEtsConfigParts = explode(':', $this->RTEtsConfigParams);
$RTEsetup = $this->getBackendUser()->getTSConfig('RTE', BackendUtility::getPagesTSconfig($RTEtsConfigParts[5]));
$this->thisConfig = BackendUtility::RTEsetup($RTEsetup['properties'], $RTEtsConfigParts[0], $RTEtsConfigParts[2], $RTEtsConfigParts[4]);
$this->RTEProperties = $RTEsetup['properties'];
$this->thisConfig = BackendUtility::RTEsetup($this->RTEProperties, $RTEtsConfigParts[0], $RTEtsConfigParts[2], $RTEtsConfigParts[4]);
$this->buttonConfig = isset($this->thisConfig['buttons.']['link.'])
? $this->thisConfig['buttons.']['link.']
: array();
}
/**
@@ -253,7 +255,7 @@ class BrowseLinksController extends AbstractLinkBrowserController {
'all' => []
];
$titleReadOnly = $this->buttonConfig['properties.']['title.']['readOnly']
|| $this->buttonConfig[$this->currentLinkHandlerId . '.']['properties.']['title.']['readOnly'];
|| $this->buttonConfig[$this->displayedLinkHandlerId . '.']['properties.']['title.']['readOnly'];
if (is_array($this->RTEProperties['classesAnchor.'])) {
foreach ($this->RTEProperties['classesAnchor.'] as $label => $conf) {
if (in_array($conf['class'], $classesAnchorArray)) {
@@ -292,7 +294,7 @@ class BrowseLinksController extends AbstractLinkBrowserController {
$this->classesAnchorJSOptions[$this->displayedLinkHandlerId] .= '<option ' . $selected . ' value="' . $class . '"' . ($classStyle ? ' style="' . $classStyle . '"' : '') . '>' . $classLabel . '</option>';
}
}
if ($this->classesAnchorJSOptions[$this->displayedLinkHandlerId] && !($this->buttonConfig['properties.']['class.']['required'] || $this->buttonConfig[$this->currentLinkHandlerId . '.']['properties.']['class.']['required'])) {
if ($this->classesAnchorJSOptions[$this->displayedLinkHandlerId] && !($this->buttonConfig['properties.']['class.']['required'] || $this->buttonConfig[$this->displayedLinkHandlerId . '.']['properties.']['class.']['required'])) {
$selected = '';
if (!$this->linkAttributeValues['class'] && !$this->classesAnchorDefault[$this->displayedLinkHandlerId]) {
$selected = 'selected="selected"';
@@ -301,10 +303,10 @@ class BrowseLinksController extends AbstractLinkBrowserController {
}
}
// Default target
$this->defaultLinkTarget = $this->classesAnchorDefault[$this->currentLinkHandlerId] && $this->classesAnchorDefaultTarget[$this->currentLinkHandlerId]
? $this->classesAnchorDefaultTarget[$this->currentLinkHandlerId]
: (isset($this->buttonConfig[$this->currentLinkHandlerId . '.']['properties.']['target.']['default'])
? $this->buttonConfig[$this->currentLinkHandlerId . '.']['properties.']['target.']['default']
$this->defaultLinkTarget = $this->classesAnchorDefault[$this->displayedLinkHandlerId] && $this->classesAnchorDefaultTarget[$this->displayedLinkHandlerId]
? $this->classesAnchorDefaultTarget[$this->displayedLinkHandlerId]
: (isset($this->buttonConfig[$this->displayedLinkHandlerId . '.']['properties.']['target.']['default'])
? $this->buttonConfig[$this->displayedLinkHandlerId . '.']['properties.']['target.']['default']
: (isset($this->buttonConfig['properties.']['target.']['default'])
? $this->buttonConfig['properties.']['target.']['default']
: ''));
@@ -356,8 +358,8 @@ class BrowseLinksController extends AbstractLinkBrowserController {
protected function getAllowedItems() {
$allowedItems = parent::getAllowedItems();
$blindLinkOptions = isset($this->RTEProperties['default.']['blindLinkOptions'])
? GeneralUtility::trimExplode(',', $this->RTEProperties['default.']['blindLinkOptions'], TRUE)
$blindLinkOptions = isset($this->thisConfig['blindLinkOptions'])
? GeneralUtility::trimExplode(',', $this->thisConfig['blindLinkOptions'], true)
: [];
$allowedItems = array_diff($allowedItems, $blindLinkOptions);
@@ -376,8 +378,8 @@ class BrowseLinksController extends AbstractLinkBrowserController {
protected function getAllowedLinkAttributes() {
$allowedLinkAttributes = parent::getAllowedLinkAttributes();
$blindLinkFields = isset($this->RTEProperties['default.']['blindLinkFields'])
? GeneralUtility::trimExplode(',', $this->RTEProperties['default.']['blindLinkFields'], TRUE)
$blindLinkFields = isset($this->thisConfig['blindLinkFields'])
? GeneralUtility::trimExplode(',', $this->thisConfig['blindLinkFields'], true)
: [];
$allowedLinkAttributes = array_diff($allowedLinkAttributes, $blindLinkFields);
@@ -395,10 +397,7 @@ class BrowseLinksController extends AbstractLinkBrowserController {
$fieldRenderingDefinitions['class'] = $this->getClassField();
$fieldRenderingDefinitions['target'] = $this->getTargetField();
$fieldRenderingDefinitions['rel'] = $this->getRelField();
if (
isset($this->buttonConfig['queryParametersSelector.']['enabled'])
&& !$this->buttonConfig['queryParametersSelector.']['enabled']
) {
if (empty($this->buttonConfig['queryParametersSelector.']['enabled'])) {
unset($fieldRenderingDefinitions['params']);
}
return $fieldRenderingDefinitions;
@@ -419,7 +418,7 @@ class BrowseLinksController extends AbstractLinkBrowserController {
: '';
// @todo define label "linkRelationship" below in xlf
return '
<form action="" name="lrelform" id="lrelform">
<form action="" name="lrelform" id="lrelform" class="t3js-dummyform">
<table border="0" cellpadding="2" cellspacing="1" id="typo3-linkRel">
<tr>
<td><label>' . $this->getLanguageService()->getLL('linkRelationship', TRUE) . ':</label></td>
@@ -455,7 +454,7 @@ class BrowseLinksController extends AbstractLinkBrowserController {
}
return '
<form action="" name="ltargetform" id="ltargetform">
<form action="" name="ltargetform" id="ltargetform" class="t3js-dummyform">
<table border="0" cellpadding="2" cellspacing="1" id="typo3-linkTarget">
<tr' . ($targetSelectorConfig['disabled'] ? ' style="display: none;"' : '') . '>
<td style="width: 96px;">' . $lang->getLL('target', TRUE) . ':</td>
@@ -478,10 +477,10 @@ class BrowseLinksController extends AbstractLinkBrowserController {
if ($this->linkAttributeValues['title']) {
$title = $this->linkAttributeValues['title'];
} else {
$title = !$this->classesAnchorDefault[$this->currentLinkHandlerId] ? '' : $this->classesAnchorDefaultTitle[$this->currentLinkHandlerId];
$title = !$this->classesAnchorDefault[$this->displayedLinkHandlerId] ? '' : $this->classesAnchorDefaultTitle[$this->displayedLinkHandlerId];
}
if (isset($this->buttonConfig[$this->currentLinkHandlerId . '.']['properties.']['title.']['readOnly'])) {
$readOnly = (bool) $this->buttonConfig[$this->currentLinkHandlerId . '.']['properties.']['title.']['readOnly'];
if (isset($this->buttonConfig[$this->displayedLinkHandlerId . '.']['properties.']['title.']['readOnly'])) {
$readOnly = (bool)$this->buttonConfig[$this->displayedLinkHandlerId . '.']['properties.']['title.']['readOnly'];
} else {
$readOnly = isset($this->buttonConfig['properties.']['title.']['readOnly'])
? (bool) $this->buttonConfig['properties.']['title.']['readOnly']
@@ -491,14 +490,14 @@ class BrowseLinksController extends AbstractLinkBrowserController {
if ($readOnly) {
$currentClass = $this->linkAttributeFields['class'];
if (!$currentClass) {
$currentClass = empty($this->classesAnchorDefault[$this->currentLinkHandlerId]) ? '' : $this->classesAnchorDefault[$this->currentLinkHandlerId];
$currentClass = empty($this->classesAnchorDefault[$this->displayedLinkHandlerId]) ? '' : $this->classesAnchorDefault[$this->displayedLinkHandlerId];
}
$title = $currentClass
? $this->classesAnchorClassTitle[$currentClass]
: $this->classesAnchorDefaultTitle[$this->currentLinkHandlerId];
: $this->classesAnchorDefaultTitle[$this->displayedLinkHandlerId];
}
return '
<form action="" name="ltitleform" id="ltitleform">
<form action="" name="ltitleform" id="ltitleform" class="t3js-dummyform">
<table border="0" cellpadding="2" cellspacing="1" id="typo3-linkTitle">
<tr>
<td style="width: 96px;"><label for="rtehtmlarea-browse-links-anchor_title" id="rtehtmlarea-browse-links-title-label">' . $this->getLanguageService()->getLL('anchor_title', TRUE) . '</label></td>
@@ -521,14 +520,14 @@ class BrowseLinksController extends AbstractLinkBrowserController {
*/
protected function getClassField() {
$selectClass = '';
if ($this->classesAnchorJSOptions[$this->currentLinkHandlerId]) {
if ($this->classesAnchorJSOptions[$this->displayedLinkHandlerId]) {
$selectClass = '
<form action="" name="lclassform" id="lclassform">
<form action="" name="lclassform" id="lclassform" class="t3js-dummyform">
<table border="0" cellpadding="2" cellspacing="1" id="typo3-linkClass">
<tr>
<td style="width: 96px;">' . $this->getLanguageService()->getLL('anchor_class', TRUE) . '</td>
<td><select name="lclass" class="t3js-class-selector">
' . $this->classesAnchorJSOptions[$this->currentLinkHandlerId] . '
' . $this->classesAnchorJSOptions[$this->displayedLinkHandlerId] . '
</select></td>
</tr>
</table>