Ticket #2140: 2140_2.patch

editor/_source/classes/fckkeystrokehandler.js

@@ -76 +76 @@
         // Get the key code.
         var keystroke = ev.keyCode || ev.which ;
 
-        // Combine it with the CTRL, SHIFT and ALT states.
-        var keyModifiers = 0 ;
+        // Combine it with the CTRL, SHIFT and ALT states.
+        var keyModifiers = _FCKKeystrokeHandler_GetKeyModifiers(evt) ;
 
-        if ( ev.ctrlKey || ev.metaKey )
-                keyModifiers += CTRL ;
+        var keyCombination = keystroke + keyModifiers ;
 
-        if ( ev.shiftKey )
-                keyModifiers += SHIFT ;
-
-        if ( ev.altKey )
-                keyModifiers += ALT ;
-
-        var keyCombination = keystroke + keyModifiers ;
-
         var cancelIt = keystrokeHandler._CancelIt = false ;
 
         // Look for its definition availability.
@@ -97 +88 @@
 
 //      FCKDebug.Output( 'KeyDown: ' + keyCombination + ' - Value: ' + keystrokeValue ) ;
 
+        if( keystroke == 13 && ( FCKBrowserInfo.IsGecko && FCKBrowserInfo.IsMac )){
+                return true;
+        }
+
+
         // If the keystroke is defined
         if ( keystrokeValue )
         {
@@ -125 +121 @@
         return true ;
 }
 
+function _FCKKeystrokeHandler_GetKeyModifiers( ev )
+{
+  var keyModifiers = 0;
+        if ( ev.ctrlKey || ev.metaKey )
+                keyModifiers += CTRL ;
+
+        if ( ev.shiftKey )
+                keyModifiers += SHIFT ;
+
+        if ( ev.altKey )
+                keyModifiers += ALT ;
+} 
+
 function _FCKKeystrokeHandler_OnKeyPress( ev, keystrokeHandler )
 {
+  // Get the key code.
+        var keystroke = ev.keyCode || ev.which ;
+
+        // Combine it with the CTRL, SHIFT and ALT states.
+        var keyModifiers = _FCKKeystrokeHandler_GetKeyModifiers(ev);
+        var keyCombination = keystroke + keyModifiers ;  
+        var keystrokeValue = keystrokeHandler.Keystrokes[ keyCombination ] ;
+
+  if( keystroke == 13 && ( FCKBrowserInfo.IsGecko && FCKBrowserInfo.IsMac )){
+     if ( keystrokeValue ) {
+        if (keystrokeHandler.OnKeystroke) {
+            keystrokeHandler.OnKeystroke.apply( keystrokeHandler, keystrokeValue );
+        }
+        keystrokeHandler._CancelIt = true;
+     }                                    
+  }                                         
+  
         if ( keystrokeHandler._CancelIt )
         {
 //              FCKDebug.Output( 'KeyPress Cancel', 'Red') ;