Added feature #7872: htmlArea RTE: Allow CSS-styles for tables without having to...
authorStanislas Rolland <typo3@sjbr.ca>
Fri, 5 Nov 2010 15:06:31 +0000 (15:06 +0000)
committerStanislas Rolland <typo3@sjbr.ca>
Fri, 5 Nov 2010 15:06:31 +0000 (15:06 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@9284 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/rtehtmlarea/ChangeLog
typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php
typo3/sysext/rtehtmlarea/extensions/TableOperations/class.tx_rtehtmlarea_tableoperations.php

index 8243411..4daf46f 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-05  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Added feature #7872: htmlArea RTE: Allow CSS-styles for tables without having to activate blockstyle
+
 2010-11-05  Steffen Gebert  <steffen@steffen-gebert.de>
 
        * Added feature #16258: Add Khmer language to TYPO3 core (Thanks to Keo Visay)
index 32a02b4..8a2ffad 100644 (file)
@@ -1,3 +1,7 @@
+2010-11-05  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Added feature #7872: htmlArea RTE: Allow CSS-styles for tables without having to activate blockstyle
+
 2010-11-04  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Added feature #16257: htmlArea RTE: Rewrite stylesheets parsing functions
index 26fab87..11fa67a 100644 (file)
@@ -855,10 +855,8 @@ class tx_rtehtmlarea_base extends t3lib_rteapi {
                if (is_array($this->thisConfig['buttons.'])) {
                        foreach ($this->thisConfig['buttons.'] as $buttonIndex => $conf) {
                                $button = substr($buttonIndex, 0, -1);
-                               if (in_array($button,$this->toolbar)) {
                                        $configureRTEInJavascriptString .= '
                        RTEarea[editornumber].buttons.'.$button.' = ' . $this->buildNestedJSArray($conf) . ';';
-                               }
                        }
                }
 
index 249d980..dad4840 100644 (file)
@@ -40,8 +40,7 @@ class tx_rtehtmlarea_tableoperations extends tx_rtehtmlarea_api {
        protected $toolbar;                                     // Reference to RTE toolbar array
        protected $LOCAL_LANG;                                  // Frontend language array
        protected $requiresClassesConfiguration = true;         // True if the registered plugin requires the PageTSConfig Classes configuration
-       protected $requiredPlugins = 'TYPO3Color';              // The comma-separated list of names of prerequisite plugins
-
+       protected $requiredPlugins = 'TYPO3Color,BlockStyle';   // The comma-separated list of names of prerequisite plugins
        protected $pluginButtons = 'table, toggleborders, tableproperties, tablerestyle, rowproperties, rowinsertabove, rowinsertunder, rowdelete, rowsplit,
                                                columnproperties, columninsertbefore, columninsertafter, columndelete, columnsplit,
                                                cellproperties, cellinsertbefore, cellinsertafter, celldelete, cellsplit, cellmerge';
@@ -67,20 +66,13 @@ class tx_rtehtmlarea_tableoperations extends tx_rtehtmlarea_api {
                'cellsplit'             => 'TO-cell-split',
                'cellmerge'             => 'TO-cell-merge',
                );
-
        public function main($parentObject) {
-
                $available = parent::main($parentObject);
-
                if ($this->htmlAreaRTE->client['browser'] == 'opera') {
                        $this->thisConfig['hideTableOperationsInToolbar'] = 0;
                }
-               if ($this->thisConfig['disableSelectColor'] && $this->htmlAreaRTE->client['browser'] != 'gecko') {
-                       $this->requiredPlugins = 'DefaultColor';
-               }
                return $available;
        }
-
        /**
         * Return JS configuration of the htmlArea plugins registered by the extension
         *
@@ -144,8 +136,6 @@ class tx_rtehtmlarea_tableoperations extends tx_rtehtmlarea_api {
                }
                return $registerRTEinJavascriptString;
        }
-
-
        /**
         * Return an updated array of toolbar enabled buttons
         *
@@ -161,11 +151,8 @@ class tx_rtehtmlarea_tableoperations extends tx_rtehtmlarea_api {
                        return $show;
                }
        }
-
-} // end of class
-
+}
 if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/rtehtmlarea/extensions/TableOperations/class.tx_rtehtmlarea_tableoperations.php']) {
        include_once($TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/rtehtmlarea/extensions/TableOperations/class.tx_rtehtmlarea_tableoperations.php']);
 }
-
 ?>
\ No newline at end of file