diff --git a/typo3/gfx/colorpicker.png b/typo3/gfx/colorpicker.png deleted file mode 100644 index 78796093ebe96ba33b2786ede49c7b16f1f33015..0000000000000000000000000000000000000000 Binary files a/typo3/gfx/colorpicker.png and /dev/null differ diff --git a/typo3/gfx/colorpicker_empty.png b/typo3/gfx/colorpicker_empty.png deleted file mode 100644 index 028bf67d038b42c9ceb38fc8092318519781de1a..0000000000000000000000000000000000000000 Binary files a/typo3/gfx/colorpicker_empty.png and /dev/null differ diff --git a/typo3/sysext/backend/Classes/Form/Element/AbstractFormElement.php b/typo3/sysext/backend/Classes/Form/Element/AbstractFormElement.php index 55048393175ecb2bb01ce60a42e0b90ffca06a0b..9ed114a7e25f1ff7e27668ed19d6c210fde0460c 100644 --- a/typo3/sysext/backend/Classes/Form/Element/AbstractFormElement.php +++ b/typo3/sysext/backend/Classes/Form/Element/AbstractFormElement.php @@ -336,7 +336,7 @@ abstract class AbstractFormElement extends AbstractNode { $aOnClick = 'this.blur();' . 'vHWin=window.open('. GeneralUtility::quoteJSvalue($url) . '+\'&P[currentValue]=\'+TBE_EDITOR.rawurlencode(' . - 'document.editform[\'' . $itemName . '\'].value,200' . + 'document.editform[' . GeneralUtility::quoteJSvalue($itemName) . '].value,200' . ')' . '+\'&P[currentSelectedValues]=\'+TBE_EDITOR.curSelected(' . GeneralUtility::quoteJSvalue($itemName . $listFlag) . '),' . GeneralUtility::quoteJSvalue('popUp' . $md5ID) . ',' . @@ -345,25 +345,8 @@ abstract class AbstractFormElement extends AbstractNode { 'vHWin.focus();' . 'return false;'; - $dim = GeneralUtility::intExplode('x', $wizardConfiguration['dim']); - $dX = MathUtility::forceIntegerInRange($dim[0], 1, 200, 20); - $dY = MathUtility::forceIntegerInRange($dim[1], 1, 200, 20); - $color = $PA['itemFormElValue'] ? ' bgcolor="' . htmlspecialchars($PA['itemFormElValue']) . '"' : ''; - $skinImg = IconUtility::skinImg( - '', - $PA['itemFormElValue'] === '' ? 'gfx/colorpicker_empty.png' : 'gfx/colorpicker.png', - 'width="' . $dX . '" height="' . $dY . '"' . BackendUtility::titleAltAttrib(trim($iTitle . ' ' . $PA['itemFormElValue'])) . ' border="0"' - ); - $otherWizards[] = - '<table border="0" id="' . $md5ID . '"' . $color . ' style="' . htmlspecialchars($wizardConfiguration['tableStyle']) . '">' . - '<tr>' . - '<td>' . - '<a class="btn btn-default" href="#" onclick="' . htmlspecialchars($aOnClick) . '">' . '<img ' . $skinImg . '>' . '</a>' . - '</td>' . - '</tr>' . - '</table>'; + $otherWizards[] = '<a id="' . $md5ID . '" class="btn btn-default" href="#" onclick="' . htmlspecialchars($aOnClick) . '"><span class="t3-icon fa fa-eyedropper"></span></a>'; break; - case 'slider': $params = array(); $params['fieldConfig'] = $fieldConfig; diff --git a/typo3/sysext/core/Documentation/Changelog/master/Breaking-67825-RemoveColorpickerOptionsDimAndTableStyle.rst b/typo3/sysext/core/Documentation/Changelog/master/Breaking-67825-RemoveColorpickerOptionsDimAndTableStyle.rst new file mode 100644 index 0000000000000000000000000000000000000000..9c5353f7c110b572aa6345daa8d47f3d598f400b --- /dev/null +++ b/typo3/sysext/core/Documentation/Changelog/master/Breaking-67825-RemoveColorpickerOptionsDimAndTableStyle.rst @@ -0,0 +1,27 @@ +==================================================================== +Breaking: #67825 - Remove colorpicker options "dim" and "tableStyle" +==================================================================== + +Description +=========== + +``TCA`` colorpicker options "dim" and "tableStyle" have been removed. + + +Impact +====== + +The TCA options won't have any effect anymore. + + +Affected Installations +====================== + +Any extension that has a colorpicker wizard configured in ``TCA`` and uses ``dim`` +or ``tableStyle`` options is effected. + + +Migration +========= + +Both options can de safely removed. \ No newline at end of file