Project

General

Profile

Bug #19301 ยป rtehtmlarea_bugfix_9310.patch

Administrator Admin, 2008-09-15 19:08

View differences:

typo3/sysext/rtehtmlarea/class.tx_rtehtmlarea_base.php (copie de travail)
var $toolbarOrderArray = array();
protected $pluginEnabledArray = array(); // Array of plugin id's enabled in the current RTE editing area
protected $pluginEnabledCumulativeArray = array(); // Cumulative array of plugin id's enabled so far in any of the RTE editing areas of the form
public $registeredPlugins = array(); // Array of registered plugins indexd by their plugin Id's
public $registeredPlugins = array(); // Array of registered plugins indexed by their plugin Id's
/**
* Returns true if the RTE is available. Here you check if the browser requirements are met.
......
}
}
$this->toolbar = array_diff($this->toolbar, $hideLabels);
// Adding plugins declared as prerequisites by enabled plugins
$requiredPlugins = array();
foreach ($this->registeredPlugins as $pluginId => $plugin) {
if ($this->isPluginEnabled($pluginId)) {
$requiredPlugins = array_merge($requiredPlugins, t3lib_div::trimExplode(',', $plugin->getRequiredPlugins(), 1));
}
}
$requiredPlugins = array_unique($requiredPlugins);
foreach ($requiredPlugins as $pluginId) {
if (is_object($this->registeredPlugins[$pluginId]) && !$this->isPluginEnabled($pluginId)) {
$this->pluginEnabledArray[] = $pluginId;
}
}
// Completing the toolbar converion array for htmlArea
foreach ($this->registeredPlugins as $pluginId => $plugin) {
if ($this->isPluginEnabled($pluginId)) {
typo3/sysext/rtehtmlarea/class.tx_rtehtmlareaapi.php (copie de travail)
protected $convertToolbarForHtmlAreaArray = array(); // The name-converting array, converting the button names used in the RTE PageTSConfing to the button id's used by the JS scripts
protected $requiresClassesConfiguration = false; // True if the registered plugin requires the PageTSConfig Classes configuration
protected $requiresSynchronousLoad = false; // True if the plugin must be loaded synchronously
protected $requiredPlugins = ''; // The comma-separated list of names of prerequisite plugins
/**
* Returns true if the plugin is available and correctly initialized
......
$this->thisConfig =& $this->htmlAreaRTE->thisConfig;
$this->toolbar =& $this->htmlAreaRTE->toolbar;
$this->LOCAL_LANG =& $this->htmlAreaRTE->LOCAL_LANG;
// Set the value of this boolean based on the initial value of $this->pluginButtons
$this->pluginAddsButtons = !empty($this->pluginButtons);
......
if ($this->htmlAreaRTE->is_FE() && $TYPO3_CONF_VARS['EXTCONF'][$this->rteExtensionKey]['plugins'][$this->pluginName]['disableInFE']) {
return false;
}
// Localization array must be initialized here
if ($this->relativePathToLocallangFile) {
if ($this->htmlAreaRTE->is_FE()) {
......
$this->requiresSynchronousLoad = $value;
}
/**
* Returns the list of plugins required by the plugin
*
* @return string the list of plugins required by the plugin
*/
public function getRequiredPlugins() {
return $this->requiredPlugins;
}
} // end of class
if (defined('TYPO3_MODE') && $TYPO3_CONF_VARS[TYPO3_MODE]['XCLASS']['ext/rtehtmlarea/class.tx_rtehtmlareaapi.php']) {
typo3/sysext/rtehtmlarea/extensions/QuickTag/class.tx_rtehtmlarea_quicktag.php (copie de travail)
/***************************************************************
* Copyright notice
*
* (c) 2008 Stanislas Rolland <stanislas.rolland(arobas)fructifor.ca>
* (c) 2008 Stanislas Rolland <typo3(arobas)sjbr.ca>
* All rights reserved
*
* This script is part of the Typo3 project. The Typo3 project is
......
/**
* CharacterMap plugin for htmlArea RTE
*
* @author Stanislas Rolland <stanislas.rolland(arobas)fructifor.ca>
* @author Stanislas Rolland <typo3(arobas)sjbr.ca>
*
* TYPO3 SVN ID: $Id$
*
......
protected $convertToolbarForHtmlAreaArray = array (
'inserttag' => 'InsertTag',
);
protected $requiredPlugins = 'TYPO3Color'; // The comma-separated list of names of prerequisite plugins
public function main($parentObject) {
$available = parent::main($parentObject);
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
*
typo3/sysext/rtehtmlarea/extensions/TableOperations/class.tx_rtehtmlarea_tableoperations.php (copie de travail)
/***************************************************************
* Copyright notice
*
* (c) 2008 Stanislas Rolland <stanislas.rolland(arobas)fructifor.ca>
* (c) 2008 Stanislas Rolland <typo3(arobas)sjbr.ca>
* All rights reserved
*
* This script is part of the Typo3 project. The Typo3 project is
......
/**
* Table Operations extension for htmlArea RTE
*
* @author Stanislas Rolland <stanislas.rolland(arobas)fructifor.ca>
* @author Stanislas Rolland <typo3(arobas)sjbr.ca>
*
* TYPO3 SVN ID: $Id$
*
......
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 $pluginButtons = 'table, toggleborders, tableproperties, tablerestyle, rowproperties, rowinsertabove, rowinsertunder, rowdelete, rowsplit,
columnproperties, columninsertbefore, columninsertafter, columndelete, columnsplit,
......
);
public function main($parentObject) {
global $TYPO3_CONF_VARS;
$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;
}
    (1-1/1)