Added feature #10325: htmlArea RTE: Make hotkey for enableWordClean feature configurable
authorStanislas Rolland <typo3@sjbr.ca>
Mon, 2 Feb 2009 00:30:38 +0000 (00:30 +0000)
committerStanislas Rolland <typo3@sjbr.ca>
Mon, 2 Feb 2009 00:30:38 +0000 (00:30 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@4915 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/rtehtmlarea/ChangeLog
typo3/sysext/rtehtmlarea/doc/manual.sxw
typo3/sysext/rtehtmlarea/extensions/DefaultClean/class.tx_rtehtmlarea_defaultclean.php
typo3/sysext/rtehtmlarea/extensions/TYPO3HtmlParser/class.tx_rtehtmlarea_typo3htmlparser.php

index adcf969..c6a5463 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
        * Fixed bug #10323: htmlArea RTE: hotkey CTRL+0 is not honoured
        * Fixed bug #10324: htmlArea RTE: Configured hotkeys are not honoured in Safari
+       * Added feature #10325: htmlArea RTE: Make hotkey for enableWordClean feature configurable
 
 2009-02-01  Ingo Renner  <ingo@typo3.org>
 
index 4add569..cd40bdf 100644 (file)
@@ -2,6 +2,7 @@
 
        * Fixed bug #10323: htmlArea RTE: hotkey CTRL+0 is not honoured
        * Fixed bug #10324: htmlArea RTE: Configured hotkeys are not honoured in Safari
+       * Added feature #10325: htmlArea RTE: Make hotkey for enableWordClean feature configurable
 
 2009-01-26  Stanislas Rolland  <typo3@sjbr.ca>
 
index 79958c4..13e851d 100644 (file)
Binary files a/typo3/sysext/rtehtmlarea/doc/manual.sxw and b/typo3/sysext/rtehtmlarea/doc/manual.sxw differ
index 3e327de..a8a640a 100644 (file)
@@ -73,7 +73,7 @@ class tx_rtehtmlarea_defaultclean extends tx_rtehtmlareaapi {
                        RTEarea['.$RTEcounter.'].buttons.'. $button .' = new Object();';
                        }
                        $registerRTEinJavascriptString .= '
-                       RTEarea['.$RTEcounter.'].buttons.'. $button .' = {"hotKey" : "0"};';
+                       RTEarea['.$RTEcounter.'].buttons.'. $button .' = {"hotKey" : "' . ($this->thisConfig['enableWordClean.']['hotKey'] ? $this->thisConfig['enableWordClean.']['hotKey'] : '0') . '"};';
                }
                return $registerRTEinJavascriptString;
        }
index aab7dd2..8cfba23 100644 (file)
@@ -74,7 +74,7 @@ class tx_rtehtmlarea_typo3htmlparser extends tx_rtehtmlareaapi {
                        }
                        $registerRTEinJavascriptString .= '
                        RTEarea['.$RTEcounter.'].buttons.'. $button .'.pathParseHtmlModule = "' . $this->htmlAreaRTE->extHttpPath . 'mod6/parse_html.php";
-                       RTEarea['.$RTEcounter.'].buttons.'. $button .'.hotKey = 0;';
+                       RTEarea['.$RTEcounter.'].buttons.'. $button .'.hotKey = "' . ($this->thisConfig['enableWordClean.']['hotKey'] ? $this->thisConfig['enableWordClean.']['hotKey'] : '0') . '";';
                }
                return $registerRTEinJavascriptString;
        }