[TASK] RTE: Remove PageTSConfig properties deprecated since TYPO3 4.6
authorStanislas Rolland <typo3@sjbr.ca>
Wed, 4 Jul 2012 04:48:44 +0000 (00:48 -0400)
committerStanislas Rolland <typo3@sjbr.ca>
Wed, 4 Jul 2012 13:37:41 +0000 (15:37 +0200)
Remove PageTSConfig properties that were deprecated in TYPO3 4.6.

Change-Id: I22d3230134a85d36aa10ebe479cbcb156d4abb2e
Releases: 6.0
Resolves: #38618
Reviewed-on: http://review.typo3.org/12564
Reviewed-by: Stanislas Rolland
Tested-by: Stanislas Rolland
14 files changed:
typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php
typo3/sysext/rtehtmlarea/doc/manual.sxw
typo3/sysext/rtehtmlarea/extensions/BlockElements/class.tx_rtehtmlarea_blockelements.php
typo3/sysext/rtehtmlarea/extensions/ContextMenu/class.tx_rtehtmlarea_contextmenu.php
typo3/sysext/rtehtmlarea/extensions/SelectFont/class.tx_rtehtmlarea_selectfont.php
typo3/sysext/rtehtmlarea/extensions/TYPO3Image/class.tx_rtehtmlarea_typo3image.php
typo3/sysext/rtehtmlarea/extensions/TYPO3Link/class.tx_rtehtmlarea_typo3link.php
typo3/sysext/rtehtmlarea/hooks/install/class.tx_rtehtmlarea_deprecatedrteproperties.php
typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js
typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockStyle/block-style.js
typo3/sysext/rtehtmlarea/htmlarea/plugins/TextStyle/text-style.js
typo3/sysext/rtehtmlarea/mod4/class.tx_rtehtmlarea_select_image.php
typo3/sysext/rtehtmlarea/res/demo/pageTSConfig.txt
typo3/sysext/rtehtmlarea/res/typical/pageTSConfig.txt

index 62c2e1d..e12841e 100644 (file)
@@ -824,16 +824,6 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
                        RTEarea[editornumber].useHTTPS = ' . ((trim(stristr($this->siteURL, 'https')) || $this->thisConfig['forceHTTPS'])?'true':'false') . ';
                        RTEarea[editornumber].tceformsNested = ' . (is_object($this->TCEform) && method_exists($this->TCEform, 'getDynNestedStack') ? $this->TCEform->getDynNestedStack(TRUE) : '[]') . ';
                        RTEarea[editornumber].dialogueWindows = new Object();';
-                       // The following property is deprecated as of TYPO3 4.6 and will be removed in TYPO3 4.8
-               if (isset($this->thisConfig['showTagFreeClasses'])) {
-                       $this->logDeprecatedProperty('showTagFreeClasses', 'buttons.blockstyle.showTagFreeClasses', '4.8');
-                       $this->logDeprecatedProperty('showTagFreeClasses', 'buttons.textstyle.showTagFreeClasses', '4.8');
-               }
-                       // The following property is deprecated as of TYPO3 4.6 and will be removed in TYPO3 4.8
-               if (isset($this->thisConfig['disablePCexamples'])) {
-                       $this->logDeprecatedProperty('disablePCexamples', 'buttons.blockstyle.disableStyleOnOptionLabel', '4.8');
-                       $this->logDeprecatedProperty('disablePCexamples', 'buttons.textstyle.disableStyleOnOptionLabel', '4.8');
-               }
                if (isset($this->thisConfig['dialogueWindows.']['defaultPositionFromTop'])) {
                        $configureRTEInJavascriptString .= '
                        RTEarea[editornumber].dialogueWindows.positionFromTop = ' . intval($this->thisConfig['dialogueWindows.']['defaultPositionFromTop']) . ';';
@@ -899,11 +889,6 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
                                RTEarea[editornumber].customTags= ' . json_encode($customTags) . ';';
                        }
                }
-                       // Process default style configuration
-                       // This default configuration is deprecated as of TYPO3 4.6 and will be removed in TYPO3 4.8.
-                       // Use contentCSS instead.
-               $configureRTEInJavascriptString .= '
-                       RTEarea[editornumber].defaultPageStyle = "' . $this->writeTemporaryFile('', 'defaultPageStyle', 'css', $this->buildStyleSheet()) . '";';
                        // Setting the pageStyle
                $configureRTEInJavascriptString .= '
                        RTEarea[editornumber].pageStyle = "' . t3lib_div::createVersionNumberedFilename($this->getContentCssFileName()) .'";';
@@ -950,58 +935,10 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
         * Build the default content style sheet
         *
         * @return string               Style sheet
-        * @deprecated since TYPO3 4.8, will be removed in TYPO3 4.10
+        * @deprecated since TYPO3 6.0, will be removed in TYPO3 6.2
         */
        function buildStyleSheet() {
-                       // These PageTSConfig properties are DEPRECATED as of TYPO3 4.6 and will be removed in TYPO3 4.8
-               $properties = array('mainStyle_font', 'mainStyle_size', 'mainStyle_color', 'mainStyle_bgcolor', 'mainStyleOverride');
-               foreach ($properties as $property) {
-                       if (isset($this->thisConfig[$property])) {
-                               $this->logDeprecatedProperty($property, 'contentCSS', '4.8');
-                       }
-               }
-               if (is_array($this->thisConfig['mainStyleOverride_add.'])) {
-                       $this->logDeprecatedProperty('mainStyleOverride_add', 'contentCSS', '4.8');
-               }
-               if (is_array($this->thisConfig['inlineStyle.']))        {
-                       $this->logDeprecatedProperty('inlineStyle', 'contentCSS', '4.8');
-               }
-               if (!trim($this->thisConfig['ignoreMainStyleOverride'])) {
-                       $mainStyle_font = $this->thisConfig['mainStyle_font'] ? $this->thisConfig['mainStyle_font']: 'Verdana,sans-serif';
-                       $mainElements = array();
-                       $mainElements['P'] = $this->thisConfig['mainStyleOverride_add.']['P'];
-                       $elList = explode(',', 'H1,H2,H3,H4,H5,H6,PRE');
-                       foreach ($elList as $elListName) {
-                               if ($this->thisConfig['mainStyleOverride_add.'][$elListName]) {
-                                       $mainElements[$elListName] = $this->thisConfig['mainStyleOverride_add.'][$elListName];
-                               }
-                       }
-
-                       $addElementCode = '';
-                       foreach ($mainElements as $elListName => $elValue) {
-                               $addElementCode .= strToLower($elListName) . ' {' . $elValue . '}' . LF;
-                       }
-
-                       $stylesheet = $this->thisConfig['mainStyleOverride'] ? $this->thisConfig['mainStyleOverride'] : LF .
-                               'body.htmlarea-content-body { font-family: ' . $mainStyle_font .
-                                       '; font-size: '.($this->thisConfig['mainStyle_size'] ? $this->thisConfig['mainStyle_size'] : '12px') .
-                                       '; color: '.($this->thisConfig['mainStyle_color']?$this->thisConfig['mainStyle_color'] : 'black') .
-                                       '; background-color: '.($this->thisConfig['mainStyle_bgcolor'] ? $this->thisConfig['mainStyle_bgcolor'] : 'white') .
-                                       ';'.$this->thisConfig['mainStyleOverride_add.']['BODY'].'}' . LF .
-                               'td { ' . $this->thisConfig['mainStyleOverride_add.']['TD'].'}' . LF .
-                               'div { ' . $this->thisConfig['mainStyleOverride_add.']['DIV'].'}' . LF .
-                               'pre { ' . $this->thisConfig['mainStyleOverride_add.']['PRE'].'}' . LF .
-                               'ol { ' . $this->thisConfig['mainStyleOverride_add.']['OL'].'}' . LF .
-                               'ul { ' . $this->thisConfig['mainStyleOverride_add.']['UL'].'}' . LF .
-                               'blockquote { ' . $this->thisConfig['mainStyleOverride_add.']['BLOCKQUOTE'].'}' . LF .
-                               $addElementCode;
-
-                       if (is_array($this->thisConfig['inlineStyle.']))        {
-                               $stylesheet .= LF . implode(LF, $this->thisConfig['inlineStyle.']) . LF;
-                       }
-               } else {
-                       $stylesheet = '/* mainStyleOverride and inlineStyle properties ignored. */';
-               }
+               $stylesheet = '/* mainStyleOverride and inlineStyle properties ignored. */';
                return $stylesheet;
        }
 
@@ -1013,22 +950,6 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
         * @return      string          Javascript configuration of classes
         */
        function buildJSClassesConfig($RTEcounter) {
-                       // Build JS array of lists of classes
-                       // These PageTSConfig properties are DEPRECATED as of TYPO3 4.6 and will be removed in TYPO3 4.8
-               $classesTagList = 'classesCharacter, classesParagraph, classesImage, classesTable, classesLinks, classesTD';
-               $classesTagConvert = array('classesCharacter' => 'span', 'classesParagraph' => 'div', 'classesImage' => 'img', 'classesTable' => 'table', 'classesLinks' => 'a', 'classesTD' => 'td');
-               $classesUseInstead = array('classesCharacter' => 'buttons.textstyle.tags.span.allowedClasses', 'classesParagraph' => 'buttons.blockstyle.tags.div.allowedClasses', 'classesImage' => 'buttons.image.properties.class.allowedClasses', 'classesTable' => 'buttons.blockstyle.tags.table.allowedClasses', 'classesLinks' => 'buttons.link.properties.class.allowedClasses', 'classesTD' => 'buttons.blockstyle.tags.td.allowedClasses');
-               $classesTagArray = t3lib_div::trimExplode(',', $classesTagList);
-               $configureRTEInJavascriptString = '
-                       RTEarea[editornumber].classesTag = new Object();';
-               foreach ($classesTagArray as $classesTagName) {
-                       $HTMLAreaJSClasses = $this->thisConfig[$classesTagName] ? ('"' . $this->cleanList($this->thisConfig[$classesTagName]) . '";') : 'null;';
-                       $configureRTEInJavascriptString .= '
-                       RTEarea[editornumber].classesTag.'. $classesTagConvert[$classesTagName] .' = '. $HTMLAreaJSClasses;
-                       if (isset($this->thisConfig[$classesTagName])) {
-                               $this->logDeprecatedProperty($classesTagName, $classesUseInstead[$classesTagName], '4.8');
-                       }
-               }
                        // Include JS arrays of configured classes
                $configureRTEInJavascriptString .= '
                        RTEarea[editornumber].classesUrl = "' . (($this->is_FE() && $GLOBALS['TSFE']->absRefPrefix) ? $GLOBALS['TSFE']->absRefPrefix : '') . $this->writeTemporaryFile('', 'classes_' . $this->language, 'js', $this->buildJSClassesArray(), TRUE) . '";';
index f586473..1f160c8 100644 (file)
Binary files a/typo3/sysext/rtehtmlarea/doc/manual.sxw and b/typo3/sysext/rtehtmlarea/doc/manual.sxw differ
index 7826244..a9d77d5 100644 (file)
@@ -131,12 +131,6 @@ class tx_rtehtmlarea_blockelements extends tx_rtehtmlarea_api {
                                $prefixLabelWithTag = ($this->thisConfig['buttons.']['formatblock.']['prefixLabelWithTag']) ? TRUE : $prefixLabelWithTag;
                                $postfixLabelWithTag = ($this->thisConfig['buttons.']['formatblock.']['postfixLabelWithTag']) ? TRUE : $postfixLabelWithTag;
                        }
-                               // Processing old style configuration for hiding paragraphs
-                               // DEPRECATED property will be removed in TYPO3 4.8
-                       if (isset($this->thisConfig['hidePStyleItems'])) {
-                               $hideItems = array_merge($hideItems, t3lib_div::trimExplode(',', $this->htmlAreaRTE->cleanList(t3lib_div::strtolower($this->thisConfig['hidePStyleItems'])), 1));
-                               $this->htmlAreaRTE->logDeprecatedProperty('hidePStyleItems', 'buttons.formatblock.removeItems', '4.8');
-                       }
                                // Adding custom items
                        $blockElementsOrder = array_merge(t3lib_div::trimExplode(',', $this->htmlAreaRTE->cleanList($blockElementsOrder), 1), $addItems);
                                // Add div element if indent is configured in the toolbar
index 0fa65b6..fb71281 100644 (file)
@@ -43,15 +43,6 @@ class tx_rtehtmlarea_contextmenu extends tx_rtehtmlarea_api {
 
        public function main($parentObject) {
                $enabled = parent::main($parentObject) && !($this->htmlAreaRTE->client['browser'] == 'opera' || $this->thisConfig['contextMenu.']['disabled']);
-                       // DEPRECATED properties will be removed in TYPO3 4.8
-               if (isset($this->thisConfig['disableRightClick'])) {
-                       $enabled = $enabled && !$this->thisConfig['disableRightClick'];
-                       $this->htmlAreaRTE->logDeprecatedProperty('disableRightClick', 'contextMenu.disabled', '4.8');
-               }
-               if (isset($this->thisConfig['disableContextMenu'])) {
-                       $enabled = $enabled && !$this->thisConfig['disableContextMenu'];
-                       $this->htmlAreaRTE->logDeprecatedProperty('disableContextMenu', 'contextMenu.disabled', '4.8');
-               }
                return $enabled;
        }
        /**
index 9d3444f..54cebf3 100644 (file)
@@ -115,17 +115,6 @@ class tx_rtehtmlarea_selectfont extends tx_rtehtmlarea_api {
                $configureRTEInJavascriptString = '';
                $hideItems = '';
                $addItems = array();
-                       // These Page TSConfig properties are DEPRECATED as of TYPO3 4.6 and will be removed in TYPO3 4.8
-               $hideProperty = 'hideFont' .  (($buttonId == 'fontstyle') ? 'Faces' : 'Sizes');
-               if (isset($this->thisConfig[$hideProperty])) {
-                       $this->htmlAreaRTE->logDeprecatedProperty($hideProperty, 'buttons.' . $buttonId . '.removeItems', '4.8');
-               }
-               $hideItems = $this->htmlAreaRTE->cleanList($this->thisConfig[$hideProperty]);
-               $addProperty = ($buttonId == 'fontstyle') ? 'fontFace' : 'fontSize';
-               if (isset($this->thisConfig[$addProperty])) {
-                       $this->htmlAreaRTE->logDeprecatedProperty($addProperty, 'buttons.' . $buttonId . '.addItems', '4.8');
-               }
-               $addItems = t3lib_div::trimExplode(',', $this->htmlAreaRTE->cleanList($this->thisConfig[$addProperty]), 1);
                        // Getting removal and addition configuration
                if (is_array($this->thisConfig['buttons.']) && is_array($this->thisConfig['buttons.'][$buttonId . '.'])) {
                        if ($this->thisConfig['buttons.'][$buttonId . '.']['removeItems']) {
index 80d8920..058510f 100644 (file)
@@ -45,22 +45,9 @@ class tx_rtehtmlarea_typo3image extends tx_rtehtmlarea_api {
 
        public function main($parentObject) {
                $enabled = parent::main($parentObject);
-                       // This PageTSConfig property is deprecated as of TYPO3 4.6 and will be removed in TYPO3 4.8
-               if (isset($this->thisConfig['blindImageOptions'])) {
-                       $this->htmlAreaRTE->logDeprecatedProperty('blindImageOptions', 'buttons.image.options.removeItems', '4.8');
-               }
-                       // This PageTSConfig property is deprecated as of TYPO3 4.6 and will be removed in TYPO3 4.8
-               if (isset($this->thisConfig['classesImage'])) {
-                       $this->htmlAreaRTE->logDeprecatedProperty('classesImage', 'buttons.image.properties.class.allowedClasses', '4.8');
-               }
-                       // This PageTSConfig property is deprecated as of TYPO3 4.6 and will be removed in TYPO3 4.8
-               if (isset($this->thisConfig['disableTYPO3Browsers'])) {
-                       $this->htmlAreaRTE->logDeprecatedProperty('disableTYPO3Browsers', 'buttons.image.TYPO3Browser.disabled', '4.8');
-               }
                        // Check if this should be enabled based on extension configuration and Page TSConfig
                        // The 'Minimal' and 'Typical' default configurations include Page TSConfig that removes images on the way to the database
                $enabled = $enabled && !($this->thisConfig['proc.']['entryHTMLparser_db.']['tags.']['img.']['allowedAttribs'] == '0' && $this->thisConfig['proc.']['entryHTMLparser_db.']['tags.']['img.']['rmTagIfNoAttrib'] == '1')
-                       && !$this->thisConfig['disableTYPO3Browsers']
                        && !$this->thisConfig['buttons.']['image.']['TYPO3Browser.']['disabled'];
                return $enabled;
        }
index 7f1bd82..285faa7 100644 (file)
@@ -46,27 +46,6 @@ class tx_rtehtmlarea_typo3link extends tx_rtehtmlarea_api {
 
        public function main($parentObject) {
                $enabled = parent::main($parentObject);
-                       // This PageTSConfig property is deprecated as of TYPO3 4.6 and will be removed in TYPO3 4.8
-               if (isset($this->thisConfig['blindLinkOptions'])) {
-                       $this->htmlAreaRTE->logDeprecatedProperty('blindLinkOptions', 'buttons.link.options.removeItems', '4.8');
-               }
-                       // This PageTSConfig property is deprecated as of TYPO3 4.6 and will be removed in TYPO3 4.8
-               if (isset($this->thisConfig['disableTYPO3Browsers'])) {
-                       $enabled = $enabled && !$this->thisConfig['disableTYPO3Browsers'];
-                       $this->htmlAreaRTE->logDeprecatedProperty('disableTYPO3Browsers', 'buttons.link.TYPO3Browser.disabled', '4.8');
-               }
-                       // This PageTSConfig property is deprecated as of TYPO3 4.6 and will be removed in TYPO3 4.8
-               if (isset($this->thisConfig['classesAnchor'])) {
-                       $this->htmlAreaRTE->logDeprecatedProperty('RTE.default.classesAnchor', 'RTE.default.buttons.link.properties.class.allowedClasses', '4.8');
-               }
-                       // This PageTSConfig property is deprecated as of TYPO3 4.6 and will be removed in TYPO3 4.8
-               if (isset($this->thisConfig['classesAnchor.'])) {
-                       $this->htmlAreaRTE->logDeprecatedProperty('classesAnchor.default.[link-type]', 'buttons.link.[link-type].properties.class.default', '4.8');
-               }
-                       // This PageTSConfig property is deprecated as of TYPO3 4.6 and will be removed in TYPO3 4.8
-               if (isset($this->thisConfig['defaultLinkTarget'])) {
-                       $this->htmlAreaRTE->logDeprecatedProperty('defaultLinkTarget', 'buttons.link.properties.target.default', '4.8');
-               }
                        // Check if this should be enabled based on Page TSConfig
                return $enabled && !$this->thisConfig['buttons.']['link.']['TYPO3Browser.']['disabled'];
        }
index 7aa6403..f268b6c 100644 (file)
@@ -99,7 +99,7 @@ class tx_rtehtmlarea_deprecatedRteProperties extends Tx_Install_Updates_Base {
                        foreach ($this->doubleReplacementRteProperties as $deprecatedProperty => $replacementProperties) {
                                $deprecatedProperties .= '<tr><td>' . $deprecatedProperty . '</td><td>' . implode(' and ', $replacementProperties) . '</td></tr>' . LF;
                        }
-                       $description = '<p>The following Page TSconfig RTE properties are deprecated since TYPO3 4.6 and will be removed in TYPO3 4.8.</p>' . LF .
+                       $description = '<p>The following Page TSconfig RTE properties are deprecated since TYPO3 4.6 and have been removed in TYPO3 6.0.</p>' . LF .
                                '<table><thead><tr><th>Deprecated property</th><th>Use instead</th></tr></thead>' . LF . '<tbody>' . $deprecatedProperties . '</tboby></table>' . LF .
                                '<p>You are currently using some of these properties on <strong>' . strval($pagesCount) . '&nbsp;pages</strong>  (including deleted and hidden pages).</p>' . LF;
                        if ($pagesCount) {
index fcd7d27..7a93d07 100644 (file)
@@ -1038,19 +1038,8 @@ HTMLArea.Iframe = Ext.extend(Ext.BoxComponent, {
                        head.appendChild(link0);
                        this.getEditor().appendToLog('HTMLArea.Iframe', 'createHead', 'Skin CSS set to: ' + link0.href, 'info');
                }
-               if (this.config.defaultPageStyle) {
-                       var link = this.document.getElementsByTagName('link')[1];
-                       if (!link) {
-                               link = this.document.createElement('link');
-                               link.rel = 'stylesheet';
-                               link.type = 'text/css';
-                               link.href = ((Ext.isGecko && navigator.productSub < 2010072200 && !/^https?:\/{2}/.test(this.config.defaultPageStyle)) ? this.config.baseURL : '') + this.config.defaultPageStyle;
-                               head.appendChild(link);
-                       }
-                       this.getEditor().appendToLog('HTMLArea.Iframe', 'createHead', 'Override CSS set to: ' + link.href, 'info');
-               }
                if (this.config.pageStyle) {
-                       var link = this.document.getElementsByTagName('link')[2];
+                       var link = this.document.getElementsByTagName('link')[1];
                        if (!link) {
                                link = this.document.createElement('link');
                                link.rel = 'stylesheet';
@@ -5313,15 +5302,14 @@ HTMLArea.CSS.Parser = Ext.extend(Ext.util.Observable, {
                        }
                }
                if (this.cssLoaded) {
-                               // Expecting 3 stylesheets...
-                       if (this.editor.document.styleSheets.length > 2) {
+                               // Expecting 2 stylesheets...
+                       if (this.editor.document.styleSheets.length > 1) {
                                Ext.each(this.editor.document.styleSheets, function (styleSheet, index) {
                                        try {
                                                if (HTMLArea.isIEBeforeIE9) {
                                                        var rules = styleSheet.rules;
                                                        var imports = styleSheet.imports;
-                                                               // Default page style may contain only a comment
-                                                       if (!rules.length && !imports.length && styleSheet.href.indexOf('defaultPageStyle') === -1) {
+                                                       if (!rules.length && !imports.length) {
                                                                this.cssLoaded = false;
                                                                this.error = 'Empty rules and imports arrays of styleSheets[' + index + ']';
                                                                return false;
index 0617c74..74ac8d0 100644 (file)
@@ -38,33 +38,6 @@ HTMLArea.BlockStyle = Ext.extend(HTMLArea.Plugin, {
                this.classesUrl = this.editorConfiguration.classesUrl;
                this.pageTSconfiguration = this.editorConfiguration.buttons.blockstyle;
                this.tags = (this.pageTSconfiguration && this.pageTSconfiguration.tags) ? this.pageTSconfiguration.tags : {};
-                       // classesTag is DEPRECATED as of TYPO3 4.6 and will be removed#in TYPO3 4.8
-               if (typeof(this.editorConfiguration.classesTag) !== "undefined") {
-                       if (this.editorConfiguration.classesTag.div) {
-                               if (!this.tags.div) {
-                                       this.tags.div = new Object();
-                               }
-                               if (!this.tags.div.allowedClasses) {
-                                       this.tags.div.allowedClasses = this.editorConfiguration.classesTag.div;
-                               }
-                       }
-                       if (this.editorConfiguration.classesTag.td) {
-                               if (!this.tags.td) {
-                                       this.tags.td = new Object();
-                               }
-                               if (!this.tags.td.allowedClasses) {
-                                       this.tags.td.allowedClasses = this.editorConfiguration.classesTag.td;
-                               }
-                       }
-                       if (this.editorConfiguration.classesTag.table) {
-                               if (!this.tags.table) {
-                                       this.tags.table = new Object();
-                               }
-                               if (!this.tags.table.allowedClasses) {
-                                       this.tags.table.allowedClasses = this.editorConfiguration.classesTag.table;
-                               }
-                       }
-               }
                var allowedClasses;
                for (var tagName in this.tags) {
                        if (this.tags.hasOwnProperty(tagName)) {
@@ -79,8 +52,7 @@ HTMLArea.BlockStyle = Ext.extend(HTMLArea.Plugin, {
                                }
                        }
                }
-                       // Property this.editorConfiguration.showTagFreeClasses is deprecated as of TYPO3 4.6 and will be removed in TYPO3 4.8
-               this.showTagFreeClasses = (this.pageTSconfiguration ? this.pageTSconfiguration.showTagFreeClasses : false) || this.editorConfiguration.showTagFreeClasses;
+               this.showTagFreeClasses = this.pageTSconfiguration ? this.pageTSconfiguration.showTagFreeClasses : false;
                this.prefixLabelWithClassName = this.pageTSconfiguration ? this.pageTSconfiguration.prefixLabelWithClassName : false;
                this.postfixLabelWithClassName = this.pageTSconfiguration ? this.pageTSconfiguration.postfixLabelWithClassName : false;
                /*
@@ -284,8 +256,7 @@ HTMLArea.BlockStyle = Ext.extend(HTMLArea.Plugin, {
                        }
                        Ext.iterate(allowedClasses, function (cssClass, value) {
                                var style = null;
-                                       // this.editor.config.disablePCexamples is deprecated as of TYPO3 4.6 and will be removed in TYPO 4.8
-                               if (!this.pageTSconfiguration.disableStyleOnOptionLabel && !this.editor.config.disablePCexamples) {
+                               if (!this.pageTSconfiguration.disableStyleOnOptionLabel) {
                                        if (HTMLArea.classesValues[cssClass] && !HTMLArea.classesNoShow[cssClass]) {
                                                style = HTMLArea.classesValues[cssClass];
                                        } else if (/-[0-9]+$/.test(cssClass) && HTMLArea.classesValues[RegExp.leftContext + '-'])  {
index d0d408b..08e0c42 100644 (file)
@@ -39,17 +39,6 @@ HTMLArea.TextStyle = Ext.extend(HTMLArea.Plugin, {
                this.classesUrl = this.editorConfiguration.classesUrl;
                this.pageTSconfiguration = this.editorConfiguration.buttons.textstyle;
                this.tags = (this.pageTSconfiguration && this.pageTSconfiguration.tags) ? this.pageTSconfiguration.tags : {};
-                       // classesTag is DEPRECATED as of TYPO3 4.6 and will be removed#in TYPO3 4.8
-               if (typeof(this.editorConfiguration.classesTag) !== "undefined") {
-                       if (this.editorConfiguration.classesTag.span) {
-                               if (!this.tags.span) {
-                                       this.tags.span = new Object();
-                               }
-                               if (!this.tags.span.allowedClasses) {
-                                       this.tags.span.allowedClasses = this.editorConfiguration.classesTag.span;
-                               }
-                       }
-               }
                var allowedClasses;
                for (var tagName in this.tags) {
                        if (this.tags.hasOwnProperty(tagName)) {
@@ -64,8 +53,7 @@ HTMLArea.TextStyle = Ext.extend(HTMLArea.Plugin, {
                                }
                        }
                }
-                       // Property this.editorConfiguration.showTagFreeClasses is deprecated as of TYPO3 4.6 and will be removed in TYPO3 4.8
-               this.showTagFreeClasses = (this.pageTSconfiguration ? this.pageTSconfiguration.showTagFreeClasses : false) || this.editorConfiguration.showTagFreeClasses;
+               this.showTagFreeClasses = this.pageTSconfiguration ? this.pageTSconfiguration.showTagFreeClasses : false;
                this.prefixLabelWithClassName = this.pageTSconfiguration ? this.pageTSconfiguration.prefixLabelWithClassName : false;
                this.postfixLabelWithClassName = this.pageTSconfiguration ? this.pageTSconfiguration.postfixLabelWithClassName : false;
                /*
@@ -342,8 +330,7 @@ HTMLArea.TextStyle = Ext.extend(HTMLArea.Plugin, {
                                store.add(new store.recordType({
                                        text: value,
                                        value: cssClass,
-                                               // this.editor.config.disablePCexamples is deprecated as of TYPO3 4.6 and will be removed in TYPO 4.8
-                                       style: (!(this.pageTSconfiguration && this.pageTSconfiguration.disableStyleOnOptionLabel) && !this.editor.config.disablePCexamples && HTMLArea.classesValues && HTMLArea.classesValues[cssClass] && !HTMLArea.classesNoShow[cssClass]) ? HTMLArea.classesValues[cssClass] : null
+                                       style: (!(this.pageTSconfiguration && this.pageTSconfiguration.disableStyleOnOptionLabel) && HTMLArea.classesValues && HTMLArea.classesValues[cssClass] && !HTMLArea.classesNoShow[cssClass]) ? HTMLArea.classesValues[cssClass] : null
                                }));
                        }, this);
                }
index a07956a..adfac0d 100644 (file)
@@ -379,14 +379,6 @@ class tx_rtehtmlarea_select_image extends browse_links {
                                $removedProperties = t3lib_div::trimExplode(',', $this->buttonConfig['properties.']['removeItems'], 1);
                        }
                }
-                       // The following property is deprecated as of TYPO3 4.6 and will be removed in TYPO3 4.8
-               if ($this->thisConfig['classesImage']) {
-                       $classesImageArray = t3lib_div::trimExplode(',', $this->thisConfig['classesImage'], 1);
-                       $classesImageJSOptions = '<option value=""></option>';
-                       foreach ($classesImageArray as $class) {
-                               $classesImageJSOptions .= '<option value="' .$class . '">' . $class . '</option>';
-                       }
-               }
                if ($this->buttonConfig['properties.']['class.']['allowedClasses']) {
                        $classesImageArray = t3lib_div::trimExplode(',', $this->buttonConfig['properties.']['class.']['allowedClasses'], 1);
                        $classesImageJSOptions = '<option value=""></option>';
@@ -991,9 +983,6 @@ class tx_rtehtmlarea_select_image extends browse_links {
                        // Remove options according to RTE configuration
                if (is_array($this->buttonConfig['options.']) && $this->buttonConfig['options.']['removeItems']) {
                        $allowedItems = array_diff($allowedItems, t3lib_div::trimExplode(',', $this->buttonConfig['options.']['removeItems'], 1));
-               } else {
-                               // This PageTSConfig property is deprecated as of TYPO3 4.6 and will be removed in TYPO3 4.8
-                       $allowedItems = array_diff($allowedItems, t3lib_div::trimExplode(',', $this->thisConfig['blindImageOptions'], 1));
                }
                return $allowedItems;
        }
index 0edc589..157d3cc 100644 (file)
@@ -131,11 +131,6 @@ RTE.default {
                ## Enable status bar
        showStatusBar =  1
 
-               ## Property ignoreMainStyleOverride is DEPRECATED as of TYPO3 4.6 and will be removed in TYPO3 4.8
-               ## Use stylesheet file rather than mainStyleOverride and inlineStyle properties to style the contents
-               ## When RTE.default.contentCSS is not specified, file EXT:rtehtmlarea/res/contentcsss/default.css is used.
-       ignoreMainStyleOverride = 1
-
                ## For this demo, do not remove font, strike and u tags
        proc.entryHTMLparser_db.removeTags := removeFromList(font,strike,u)
 
index bc207a4..7befb57 100644 (file)
@@ -125,11 +125,6 @@ RTE.default {
                ## Hide infrequently used block types in the block formatting selector
        buttons.formatblock.removeItems = pre,address
 
-               ## Property ignoreMainStyleOverride is DEPRECATED as of TYPO3 4.6 and will be removed in TYPO3 4.8
-               ## Use stylesheet file rather than mainStyleOverride and inlineStyle properties to style the contents.
-               ## When RTE.default.contentCSS is not specified, file EXT:rtehtmlarea/res/contentcsss/default.css is used.
-       ignoreMainStyleOverride = 1
-
                ## List all class selectors that are allowed on the way to the database
        proc.allowedClasses (
                external-link, external-link-new-window, internal-link, internal-link-new-window, download, mail,