Ticket #5330: 5330.patch
File 5330.patch, 1.2 KB (added by , 14 years ago) |
---|
-
_source/plugins/contextmenu/plugin.js
167 167 } 168 168 169 169 if ( nativeContextMenuOnCtrl 170 && ( evt.$.ctrlKey || evt.$.metaKey ) )170 && ( CKEDITOR.env.mac ? evt.$.metaKey : evt.$.ctrlKey ) ) 171 171 return; 172 172 173 173 var target = evt.getTarget(); … … 205 205 if ( nativeContextMenuOnCtrl && 206 206 // Safari on Windows always show 'ctrlKey' as true in 'contextmenu' event, 207 207 // which make this property unreliable. (#4826) 208 ( CKEDITOR.env.webkit ? holdCtrlKey : domEvent.$.ctrlKey || domEvent.$.metaKey) )208 ( CKEDITOR.env.webkit ? holdCtrlKey : ( CKEDITOR.env.mac ? domEvent.$.metaKey : domEvent.$.ctrlKey ) ) ) 209 209 return; 210 210 211 211 // Selection will be unavailable after context menu shows up … … 236 236 var holdCtrlKey, 237 237 onKeyDown = function( event ) 238 238 { 239 holdCtrlKey = event.data.$.ctrlKey || event.data.$.metaKey;239 holdCtrlKey = CKEDITOR.env.mac ? event.data.$.metaKey : event.data.$.ctrlKey ; 240 240 }, 241 241 resetOnKeyUp = function() 242 242 {