Fixed bug #14153: htmlAreaRTE: Some Page TSConfig may break default hotkey assignments
authorStanislas Rolland <typo3@sjbr.ca>
Mon, 19 Apr 2010 16:29:58 +0000 (16:29 +0000)
committerStanislas Rolland <typo3@sjbr.ca>
Mon, 19 Apr 2010 16:29:58 +0000 (16:29 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7393 709f56b5-9817-0410-a4d7-c38de5d9e867

ChangeLog
typo3/sysext/rtehtmlarea/ChangeLog
typo3/sysext/rtehtmlarea/htmlarea/plugins/BlockElements/block-elements.js
typo3/sysext/rtehtmlarea/htmlarea/plugins/DefinitionList/definition-list.js
typo3/sysext/rtehtmlarea/htmlarea/plugins/UndoRedo/undo-redo.js

index 6436ef4..03b1c8a 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-04-19  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Fixed bug #14153: htmlAreaRTE: Some Page TSConfig may break default hotkey assignments
+
 2010-04-19  Steffen Kamper  <info@sk-typo3.de>
 
        * Fixed bug #13991: Content Element Media does not work with render type "HTML Embed Element" (thanks to Sascha Egerer)
index 5c94d51..80d4899 100644 (file)
@@ -1,3 +1,7 @@
+2010-04-19  Stanislas Rolland  <typo3@sjbr.ca>
+
+       * Fixed bug #14153: htmlAreaRTE: Some Page TSConfig may break default hotkey assignments
+
 2010-04-14  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Updated htmlArea RTE manual.
index b0f94d8..cb4d280 100644 (file)
@@ -179,7 +179,7 @@ HTMLArea.BlockElements = HTMLArea.Plugin.extend({
                                        iconCls         : 'htmlarea-action-' + button[3],
                                        contextMenuTitle: this.localize(buttonId + '-contextMenuTitle'),
                                        action          : 'onButtonPress',
-                                       hotKey          : (this.buttonsConfiguration[button[2]] ? this.buttonsConfiguration[button[2]].hotKey : (button[1] ? button[1] : null))
+                                       hotKey          : ((this.buttonsConfiguration[button[2]] && this.buttonsConfiguration[button[2]].hotKey) ? this.buttonsConfiguration[button[2]].hotKey : (button[1] ? button[1] : null))
                                };
                                this.registerButton(buttonConfiguration);
                        }
index 094e560..5d49693 100644 (file)
@@ -78,7 +78,7 @@ HTMLArea.DefinitionList = HTMLArea.BlockElements.extend({
                                iconCls         : 'htmlarea-action-' + button[5],
                                action          : 'onButtonPress',
                                context         : button[1],
-                               hotKey          : (this.buttonsConfiguration[button[3]] ? this.buttonsConfiguration[button[3]].hotKey : (button[2] ? button[2] : null)),
+                               hotKey          : ((this.buttonsConfiguration[button[3]] && this.buttonsConfiguration[button[3]].hotKey) ? this.buttonsConfiguration[button[3]].hotKey : (button[2] ? button[2] : null)),
                                noAutoUpdate    : button[4]
                        };
                        this.registerButton(buttonConfiguration);
index 6274e1c..e7407bb 100644 (file)
@@ -72,7 +72,7 @@ HTMLArea.UndoRedo = HTMLArea.Plugin.extend({
                                tooltip         : this.localize(buttonId.toLowerCase()),
                                iconCls         : 'htmlarea-action-' + button[3],
                                action          : 'onButtonPress',
-                               hotKey          : (this.editorConfiguration.buttons[buttonId.toLowerCase()]?this.editorConfiguration.buttons[buttonId.toLowerCase()].hotKey:button[2]),
+                               hotKey          : ((this.editorConfiguration.buttons[buttonId.toLowerCase()] && this.editorConfiguration.buttons[buttonId.toLowerCase()].hotKey) ? this.editorConfiguration.buttons[buttonId.toLowerCase()].hotKey : button[2]),
                                noAutoUpdate    : true
                        };
                        this.registerButton(buttonConfiguration);