Index: typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php
===================================================================
--- typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php (révision 9280)
+++ typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php (copie de travail)
@@ -855,10 +855,8 @@
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: typo3/sysext/rtehtmlarea/extensions/TableOperations/class.tx_rtehtmlarea_tableoperations.php
===================================================================
--- typo3/sysext/rtehtmlarea/extensions/TableOperations/class.tx_rtehtmlarea_tableoperations.php (révision 9280)
+++ typo3/sysext/rtehtmlarea/extensions/TableOperations/class.tx_rtehtmlarea_tableoperations.php (copie de travail)
@@ -40,8 +40,7 @@
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 @@
'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 @@
}
return $registerRTEinJavascriptString;
}
-
-
/**
* Return an updated array of toolbar enabled buttons
*
@@ -161,11 +151,8 @@
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