Ticket #2140: 2140.patch

editor/_source/classes/fckkeystrokehandler.js

@@ -76 +76 @@
         // Get the key code.
         var keystroke = ev.keyCode || ev.which ;
 
+        // Added by hidekaz 2007/12/12
+        // Ignore key down of enter-key for IME(Input Method Editor) users on Gecko (MacOSX).
+        // Use key press event instead of key down event.
+        if( keystroke == 13 && ( FCKBrowserInfo.IsGecko && FCKBrowserInfo.IsMac )){
+                keystrokeHandler._CancelIt = true ;
+                ev.preventDefault();
+                return false ;
+        }
+        // end hidekaz
+
         // Combine it with the CTRL, SHIFT and ALT states.
         var keyModifiers = 0 ;
 
@@ -127 +137 @@
 
 function _FCKKeystrokeHandler_OnKeyPress( ev, keystrokeHandler )
 {
+        // Added by hidekaz 2007/12/12
+        // Ignore key down of enter-key for IME (Input Method Editor) users on Gecko (MacOSX).
+        // Use key press event instead of key down event.
+        var keystroke = ev.keyCode || ev.which ;
+        if( keystroke == 13 && ( FCKBrowserInfo.IsGecko && FCKBrowserInfo.IsMac )){
+                return true ;
+        }
+        // end hidekaz
+
         if ( keystrokeHandler._CancelIt )
         {
 //              FCKDebug.Output( 'KeyPress Cancel', 'Red') ;