X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=_source%2Fplugins%2Fcontextmenu%2Fplugin.js;h=7772820e4f0ad813badf19fe756949e5a0653b27;hb=3fe9cac293e090ea459a3ee10d78cbe9e1dd0e03;hp=22b8e49eccd76977f0e6b5b23167f3c45bc7e5cd;hpb=9afde8772159bd3436f1f5b7862960307710ae5a;p=ckeditor.git diff --git a/_source/plugins/contextmenu/plugin.js b/_source/plugins/contextmenu/plugin.js index 22b8e49..7772820 100644 --- a/_source/plugins/contextmenu/plugin.js +++ b/_source/plugins/contextmenu/plugin.js @@ -1,5 +1,5 @@ /* -Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved. +Copyright (c) 2003-2013, CKSource - Frederico Knabben. All rights reserved. For licensing, see LICENSE.html or http://ckeditor.com/license */ @@ -105,8 +105,9 @@ CKEDITOR.plugins.add( 'contextmenu', CKEDITOR.tools.setTimeout( function() { this.open( offsetParent, null, offsetX, offsetY ); - }, - 0, this ); + + // IE needs a short while to allow selection change before opening menu. (#7908) + }, CKEDITOR.env.ie? 200 : 0, this ); }, this ); @@ -166,12 +167,13 @@ CKEDITOR.plugins.add( 'contextmenu', }); /** - * Whether to show the browser native context menu when the CTRL or the - * META (Mac) key is pressed while opening the context menu. + * Whether to show the browser native context menu when the Ctrl or + * Meta (Mac) key is pressed on opening the context menu with the + * right mouse button click or the Menu key. * @name CKEDITOR.config.browserContextMenuOnCtrl * @since 3.0.2 * @type Boolean - * @default true + * @default true * @example * config.browserContextMenuOnCtrl = false; */