Ticket #4826: 4826_2.patch
File 4826_2.patch, 1.3 KB (added by , 14 years ago) |
---|
-
_source/plugins/contextmenu/plugin.js
183 183 { 184 184 var domEvent = event.data; 185 185 186 if ( nativeContextMenuOnCtrl 187 && ( domEvent.$.ctrlKey || domEvent.$.metaKey ) ) 186 if ( nativeContextMenuOnCtrl && 187 // Safari on Windows always show 'ctrlKey' as true in 'contextmenu' event, 188 // which make this property unreliable. (#4826) 189 ( CKEDITOR.env.webkit ? holdCtrlKey : domEvent.$.ctrlKey || domEvent.$.metaKey ) ) 188 190 return; 189 191 190 192 // Cancel the browser context menu. … … 201 203 0, this ); 202 204 }, 203 205 this ); 204 }, 206 207 if( CKEDITOR.env.webkit ) 208 { 209 var holdCtrlKey, 210 onKeyDown = function( event ) 211 { 212 holdCtrlKey = event.data.$.ctrlKey || event.data.$.metaKey; 213 }, 214 resetOnKeyUp = function() 215 { 216 holdCtrlKey = 0; 217 }; 205 218 219 element.on( 'keydown', onKeyDown ); 220 element.on( 'keyup', resetOnKeyUp ); 221 element.on( 'contextmenu', resetOnKeyUp ); 222 } 223 }, 224 206 225 addListener : function( listenerFn ) 207 226 { 208 227 this._.listeners.push( listenerFn );