Fixed bug #10323: htmlArea RTE: hotkey CTRL+0 is not honoured
authorStanislas Rolland <typo3@sjbr.ca>
Sun, 1 Feb 2009 21:24:54 +0000 (21:24 +0000)
committerStanislas Rolland <typo3@sjbr.ca>
Sun, 1 Feb 2009 21:24:54 +0000 (21:24 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@4908 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/rtehtmlarea/ChangeLog
typo3/sysext/rtehtmlarea/htmlarea/htmlarea.js

index e44063d..d5aed7e 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-02-01  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Fixed bug #10323: htmlArea RTE: hotkey CTRL+0 is not honoured
+
 2009-02-01  Ingo Renner  <ingo@typo3.org>
 
        * Fixed brocken icon for the TYPO3 manual with t3skin
index fddda18..c27faae 100644 (file)
@@ -1,3 +1,7 @@
+2009-02-01  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Fixed bug #10323: htmlArea RTE: hotkey CTRL+0 is not honoured
+
 2009-01-26  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Added feature #10182: htmlArea RTE: Add support for editing lang attribute
index 7e71d15..6a4353d 100644 (file)
@@ -3,7 +3,7 @@
 *
 *  (c) 2002-2004, interactivetools.com, inc.
 *  (c) 2003-2004 dynarch.com
-*  (c) 2004-2008 Stanislas Rolland <typo3(arobas)sjbr.ca>
+*  (c) 2004-2009 Stanislas Rolland <typo3(arobas)sjbr.ca>
 *  All rights reserved
 *
 *  This script is part of the TYPO3 project. The TYPO3 project is
@@ -2853,7 +2853,13 @@ HTMLArea.Plugin = HTMLArea.Base.extend({
                                if (this.editorConfiguration.registerButton(buttonConfiguration)) {
                                        var hotKey = buttonConfiguration.hotKey ? buttonConfiguration.hotKey :
                                                ((this.editorConfiguration.buttons[this.editorConfiguration.convertButtonId[buttonConfiguration.id]] && this.editorConfiguration.buttons[this.editorConfiguration.convertButtonId[buttonConfiguration.id]].hotKey) ? this.editorConfiguration.buttons[this.editorConfiguration.convertButtonId[buttonConfiguration.id]].hotKey : null);
-                                       if (hotKey) {
+                                       if (!hotKey && buttonConfiguration.hotKey == "0") {
+                                               hotKey = "0";
+                                       }
+                                       if (!hotKey && this.editorConfiguration.buttons[this.editorConfiguration.convertButtonId[buttonConfiguration.id]] && this.editorConfiguration.buttons[this.editorConfiguration.convertButtonId[buttonConfiguration.id]].hotKey == "0") {
+                                               hotKey = "0";
+                                       }
+                                       if (hotKey || hotKey == "0") {
                                                var hotKeyConfiguration = {
                                                        id      : hotKey,
                                                        cmd     : buttonConfiguration.id,