Ticket #2140: 2686.patch

editor/_source/classes/fckkeystrokehandler.js

@@ -36 +36 @@
         // For newer browsers, it is enough to listen to the keydown event only.
         // Some browsers instead, don't cancel key events in the keydown, but in the
         // keypress. So we must do a longer trip in those cases.
-        FCKTools.AddEventListenerEx( target, 'keydown', _FCKKeystrokeHandler_OnKeyDown, this ) ;
-        if ( FCKBrowserInfo.IsGecko10 || FCKBrowserInfo.IsOpera || ( FCKBrowserInfo.IsGecko && FCKBrowserInfo.IsMac ) )
-                FCKTools.AddEventListenerEx( target, 'keypress', _FCKKeystrokeHandler_OnKeyPress, this ) ;
+        if ( FCKBrowserInfo.IsGecko && FCKBrowserInfo.IsMac && !this.CancelCtrlDefaults)
+        {
+                FCKTools.AddEventListenerEx( target, 'keypress', _FCKKeystrokeHandler_OnKeyDown, this ) ;
+        }
+        else
+        {
+                FCKTools.AddEventListenerEx( target, 'keydown', _FCKKeystrokeHandler_OnKeyDown, this ) ;
+                if ( FCKBrowserInfo.IsGecko10 || FCKBrowserInfo.IsOpera || ( FCKBrowserInfo.IsGecko && FCKBrowserInfo.IsMac ) )
+                        FCKTools.AddEventListenerEx( target, 'keypress', _FCKKeystrokeHandler_OnKeyPress, this ) ;
+        }
 }
 
 /*