Fixed bug #10324: htmlArea RTE: Configured hotkeys are not honoured in Safari
authorStanislas Rolland <typo3@sjbr.ca>
Sun, 1 Feb 2009 23:11:44 +0000 (23:11 +0000)
committerStanislas Rolland <typo3@sjbr.ca>
Sun, 1 Feb 2009 23:11:44 +0000 (23:11 +0000)
git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@4913 709f56b5-9817-0410-a4d7-c38de5d9e867

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

index e68d45c..adcf969 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2009-02-01  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #10323: htmlArea RTE: hotkey CTRL+0 is not honoured
+       * Fixed bug #10324: htmlArea RTE: Configured hotkeys are not honoured in Safari
 
 2009-02-01  Ingo Renner  <ingo@typo3.org>
 
index c27faae..4add569 100644 (file)
@@ -1,6 +1,7 @@
 2009-02-01  Stanislas Rolland  <typo3@sjbr.ca>
 
        * Fixed bug #10323: htmlArea RTE: hotkey CTRL+0 is not honoured
+       * Fixed bug #10324: htmlArea RTE: Configured hotkeys are not honoured in Safari
 
 2009-01-26  Stanislas Rolland  <typo3@sjbr.ca>
 
index 6a4353d..79648f9 100644 (file)
@@ -1829,7 +1829,7 @@ HTMLArea._editorEvent = function(ev) {
                while (owner.parentElement) { owner = owner.parentElement; }
        }
        var editor = RTEarea[owner._editorNo]["editor"];
-       var keyEvent = (HTMLArea.is_ie && ev.type == "keydown") || (HTMLArea.is_gecko && ev.type == "keypress");
+       var keyEvent = ((HTMLArea.is_ie || HTMLArea.is_safari) && ev.type == "keydown") || (HTMLArea.is_gecko && ev.type == "keypress");
        editor.focusEditor();
 
        if(keyEvent) {