Fixed issue #17557: htmlArea RTE: Delete deprecated Page TSConfig properties
authorStanislas Rolland <typo3@sjbr.ca>
Sat, 12 Feb 2011 00:34:01 +0000 (00:34 +0000)
committerStanislas Rolland <typo3@sjbr.ca>
Sat, 12 Feb 2011 00:34:01 +0000 (00:34 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@10451 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/rtehtmlarea/ChangeLog
typo3/sysext/rtehtmlarea/doc/manual.sxw
typo3/sysext/rtehtmlarea/extensions/QuickTag/class.tx_rtehtmlarea_quicktag.php
typo3/sysext/rtehtmlarea/extensions/SpellChecker/class.tx_rtehtmlarea_spellchecker.php
typo3/sysext/rtehtmlarea/extensions/TableOperations/class.tx_rtehtmlarea_tableoperations.php

index 000eb8a..cd66219 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
        * Fixed issue #17552: htmlArea RTE: Delete deprecated class HTMLArea.Dialog
        * Fixed issue #17554: htmlArea RTE: Delete deprecated DAM integration extension variable
        * Fixed issue #17555: htmlArea RTE: Delete deprecated Aspell-related extension configuration variables
+       * Fixed issue #17557: htmlArea RTE: Delete deprecated Page TSConfig properties
 
 2011-02-11  Christian Kuhn  <lolli@schwarzbu.ch>
 
index 903599d..e7f67a8 100644 (file)
@@ -3,6 +3,7 @@
        * Fixed issue #17552: htmlArea RTE: Delete deprecated class HTMLArea.Dialog
        * Fixed issue #17554: htmlArea RTE: Delete deprecated DAM integration extension variable
        * Fixed issue #17555: htmlArea RTE: Delete deprecated Aspell-related extension configuration variables
+       * Fixed issue #17557: htmlArea RTE: Delete deprecated Page TSConfig properties
 
 2011-02-07  Stanislas Rolland  <typo3@sjbr.ca>
 
index dc51d1e..65a23a5 100644 (file)
Binary files a/typo3/sysext/rtehtmlarea/doc/manual.sxw and b/typo3/sysext/rtehtmlarea/doc/manual.sxw differ
index 593d08c..e13bed6 100644 (file)
@@ -53,39 +53,8 @@ class tx_rtehtmlarea_quicktag extends tx_rtehtmlarea_api {
                }
                return $available;
        }
-
-       /**
-        * Return JS configuration of the htmlArea plugins registered by the extension
-        *
-        * @param       integer         Relative id of the RTE editing area in the form
-        *
-        * @return string               JS configuration for registered plugins
-        *
-        * The returned string will be a set of JS instructions defining the configuration that will be provided to the plugin(s)
-        * Each of the instructions should be of the form:
-        *      RTEarea['.$RTEcounter.']["buttons"]["button-id"]["property"] = "value";
-        */
-       public function buildJavascriptConfiguration($RTEcounter) {
-
-               $registerRTEinJavascriptString = '';
-                       // Deprecated inserttag button configuration
-               if (in_array('inserttag', $this->toolbar) && trim($this->thisConfig['hideTags'])) {
-                       if (!is_array($this->thisConfig['buttons.']['inserttag.'])) {
-                               $registerRTEinJavascriptString .= '
-                       RTEarea['.$RTEcounter.'].buttons.inserttag = new Object();
-                       RTEarea['.$RTEcounter.'].buttons.inserttag.denyTags = "'.implode(',', t3lib_div::trimExplode(',', $this->thisConfig['hideTags'], 1)).'";';
-                       } elseif (!$this->thisConfig['buttons.']['inserttag.']['denyTags']) {
-                               $registerRTEinJavascriptString .= '
-                       RTEarea['.$RTEcounter.'].buttons.inserttag.denyTags = "'.implode(',', t3lib_div::trimExplode(',', $this->thisConfig['hideTags'], 1)).'";';
-                       }
-               }
-               return $registerRTEinJavascriptString;
-       }
-
-} // end of class
-
+}
 if (defined('TYPO3_MODE') && isset($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['ext/rtehtmlarea/extensions/QuickTag/class.tx_rtehtmlarea_quicktag.php'])) {
        include_once($GLOBALS['TYPO3_CONF_VARS'][TYPO3_MODE]['XCLASS']['ext/rtehtmlarea/extensions/QuickTag/class.tx_rtehtmlarea_quicktag.php']);
 }
-
 ?>
\ No newline at end of file
index b3b7ebb..81af93e 100644 (file)
@@ -74,8 +74,7 @@ class tx_rtehtmlarea_spellchecker extends tx_rtehtmlarea_api {
                        $spellCheckerMode = 'normal';
                }
                        // Set the use of personal dictionary
-                       // $this->thisConfig['enablePersonalDicts'] is DEPRECATED as of 4.3.0
-               $enablePersonalDicts = ($this->thisConfig['buttons.'][$button.'.']['enablePersonalDictionaries'] || $this->thisConfig['enablePersonalDicts']) ? ((isset($GLOBALS['BE_USER']->userTS['options.']['enablePersonalDicts']) && $GLOBALS['BE_USER']->userTS['options.']['enablePersonalDicts']) ? true : false) : false;
+               $enablePersonalDicts = $this->thisConfig['buttons.'][$button.'.']['enablePersonalDictionaries'] ? ((isset($GLOBALS['BE_USER']->userTS['options.']['enablePersonalDicts']) && $GLOBALS['BE_USER']->userTS['options.']['enablePersonalDicts']) ? true : false) : false;
                if (t3lib_utility_PhpOptions::isSafeModeEnabled() || $this->htmlAreaRTE->is_FE()) {
                        $enablePersonalDicts = false;
                }
index b081094..85ec03e 100644 (file)
@@ -121,18 +121,6 @@ class tx_rtehtmlarea_tableoperations extends tx_rtehtmlarea_api {
 
                        $registerRTEinJavascriptString .= '
                        RTEarea['.$RTEcounter.'].hideTableOperationsInToolbar = ' . (trim($this->thisConfig['hideTableOperationsInToolbar']) ? 'true' : 'false') . ';';
-
-                               // Deprecated toggleborders button configuration
-                       if (in_array('toggleborders',$this->toolbar) && $this->thisConfig['keepToggleBordersInToolbar']) {
-                               if (!is_array($this->thisConfig['buttons.']['toggleborders.'])) {
-                                       $registerRTEinJavascriptString .= '
-                       RTEarea['.$RTEcounter.'].buttons.toggleborders = new Object();
-                       RTEarea['.$RTEcounter.'].buttons.toggleborders.keepInToolbar = true;';
-                               } elseif (!$this->thisConfig['buttons.']['toggleborders.']['keepInToolbar']) {
-                                       $registerRTEinJavascriptString .= '
-                       RTEarea['.$RTEcounter.'].buttons.toggleborders.keepInToolbar = true;';
-                               }
-                       }
                }
                return $registerRTEinJavascriptString;
        }