Added feature #10196: htmlArea RTE: Remove extension configuration variable enableCli...
authorStanislas Rolland <typo3@sjbr.ca>
Mon, 19 Jan 2009 19:07:22 +0000 (19:07 +0000)
committerStanislas Rolland <typo3@sjbr.ca>
Mon, 19 Jan 2009 19:07:22 +0000 (19:07 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@4756 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/rtehtmlarea/ChangeLog
typo3/sysext/rtehtmlarea/doc/manual.sxw
typo3/sysext/rtehtmlarea/ext_conf_template.txt
typo3/sysext/rtehtmlarea/ext_localconf.php
typo3/sysext/rtehtmlarea/ext_tables.php
typo3/sysext/rtehtmlarea/mod4/class.tx_rtehtmlarea_select_image.php
typo3/sysext/rtehtmlarea/pi3/class.tx_rtehtmlarea_pi3.php

index c07048e..324a23d 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
 
        * Added feature #10181: htmlArea RTE: Move status bar to plugin
        * Added feature #10195: htmlArea RTE: Enable the RTE in Opera 9.62+
+       * Added feature #10196: htmlArea RTE: Remove extension configuration variable enableClickEnlarge
 
 2009-01-18  Francois Suter  <francois@typo3.org>
 
index aa7e11e..02579d3 100644 (file)
@@ -2,6 +2,7 @@
 
        * Added feature #10181: htmlArea RTE: Move status bar to plugin
        * Added feature #10195: htmlArea RTE: Enable the RTE in Opera 9.62+
+       * Added feature #10196: htmlArea RTE: Remove extension configuration variable enableClickEnlarge
 
 2009-01-14  Stanislas Rolland  <typo3@sjbr.ca>
 
index 3e946e2..5d335f4 100644 (file)
Binary files a/typo3/sysext/rtehtmlarea/doc/manual.sxw and b/typo3/sysext/rtehtmlarea/doc/manual.sxw differ
index 6178a61..bad561d 100644 (file)
@@ -34,9 +34,6 @@ enableAccessibilityIcons = 0
   # cat=basic/enable/130; type=boolean; label=Enable the DAM media browser: If set and if the DAM extension is installed, the DAM media browser will be used. DEPRECATED for DAM 1.1+. Use DAM EM setting instead.
 enableDAMBrowser = 0
 
-  # cat=basic/enable/120; type=boolean; label=Enable click-enlarge on images: If set, a click-enlarge property may be set on images inserted in the RTE.
-enableClickEnlarge = 0
-
   # cat=basic/enable/150; type=boolean; label=Enable Mozilla/Firefox extension: If set, enables the triggering of installation of a Mozilla/Firefox extension to allow the RTE to access the clipboard.
 enableMozillaExtension = 0
 
index aa84deb..64246a1 100644 (file)
@@ -2,7 +2,7 @@
 /***************************************************************
 *  Copyright notice
 *
-*  (c) 2005-2008 Stanislas Rolland <typo3(arobas)sjbr.ca>
+*  (c) 2005-2009 Stanislas Rolland <typo3(arobas)sjbr.ca>
 *  All rights reserved
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
@@ -156,7 +156,6 @@ if ($TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['enableImages']) {
        $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['TYPO3Image']['addIconsToSkin'] = 0;
        $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['TYPO3Image']['disableInFE'] = 1;
        t3lib_extMgm::addPageTSConfig('<INCLUDE_TYPOSCRIPT: source="FILE:EXT:' . $_EXTKEY . '/res/image/pageTSConfig.txt">');
-       $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['enableClickEnlarge'] = $_EXTCONF['enableClickEnlarge'] ? $_EXTCONF['enableClickEnlarge'] : 0;
 }
 $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['DefaultLink'] = array();
 $TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['plugins']['DefaultLink']['objectReference'] = 'EXT:'.$_EXTKEY.'/extensions/DefaultLink/class.tx_rtehtmlarea_defaultlink.php:&tx_rtehtmlarea_defaultlink';
index 6071ea1..b92c1ef 100644 (file)
@@ -1,10 +1,8 @@
 <?php
 if (!defined ('TYPO3_MODE'))   die ('Access denied.');
 
-       // Add static template for enabling the Click-enlarge feature
-if ($TYPO3_CONF_VARS['EXTCONF'][$_EXTKEY]['enableClickEnlarge']) {
+               // Add static template for Click-enlarge rendering
        t3lib_extMgm::addStaticFile($_EXTKEY,'static/clickenlarge/','Clickenlarge Rendering');
-}
 
        $TCA['tx_rtehtmlarea_acronym'] = Array (
        'ctrl' => Array (
index a224fcd..bc20440 100644 (file)
@@ -525,7 +525,7 @@ class tx_rtehtmlarea_select_image extends browse_links {
                                sz+=\'<tr><td\'+bgColor+\'><label for="iTitle">'.$LANG->getLL('title').': </label></td><td><input type="text" id="iTitle" name="iTitle"'.$GLOBALS['TBE_TEMPLATE']->formWidth(20).' /></td></tr>\';')
                                .(in_array('alt', $removedProperties)?'':'
                                sz+=\'<tr><td\'+bgColor+\'><label for="iAlt">'.$LANG->getLL('alt').': </label></td><td><input type="text" id="iAlt" name="iAlt"'.$GLOBALS['TBE_TEMPLATE']->formWidth(20).' /></td></tr>\';')
-                               .((!$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['enableClickEnlarge'] || in_array('clickenlarge', $removedProperties))?'':'
+                               .(in_array('clickenlarge', $removedProperties)?'':'
                                sz+=\'<tr><td\'+bgColor+\'><label for="iClickEnlarge">'.$LANG->sL('LLL:EXT:cms/locallang_ttc.php:image_zoom',1).' </label></td><td><input type="checkbox" name="iClickEnlarge" id="iClickEnlarge" value="0" /></td></tr>\';').'
                                sz+=\'<tr><td><input type="submit" value="'.$LANG->getLL('update').'" onClick="return setImageProperties();"></td></tr>\';
                                sz+=\'</form></table>\';
index a414209..7d14b9b 100644 (file)
@@ -2,7 +2,7 @@
 /***************************************************************
 *  Copyright notice
 *
-*  (c) 2005-2008 Stanislas Rolland <stanislas.rolland(arobas)fructifor.ca>
+*  (c) 2005-2009 Stanislas Rolland <typo3(arobas)sjbr.ca>
 *  All rights reserved
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
@@ -27,7 +27,7 @@
 /**
  * Render custom attribute clickenlarge
  *
- * @author Stanislas Rolland <stanislas.rolland(arobas)fructifor.ca>
+ * @author Stanislas Rolland <typo3(arobas)sjbr.ca>
  *
  * $Id$  *
  */
@@ -76,7 +76,7 @@ class tx_rtehtmlarea_pi3 extends tslib_pibase {
                unset($this->cObj->parameters['allParams']);
                $content = '<img '. t3lib_div::implodeAttributes($this->cObj->parameters, TRUE, TRUE) . ' />';
 
-               if ($TYPO3_CONF_VARS['EXTCONF'][$this->extKey]['enableClickEnlarge'] && $clickenlarge && is_array($conf['imageLinkWrap.'])) {
+               if ($clickenlarge && is_array($conf['imageLinkWrap.'])) {
                        $theImage = $file ? $GLOBALS['TSFE']->tmpl->getFileName($file) : '';
                        if ($theImage) {
                                if ($this->cObj->parameters['title']) $conf['imageLinkWrap.']['title'] = $this->cObj->parameters['title'];