Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
ckeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vanilla ckeditor-3.1.1
[ckeditor.git]
/
_source
/
plugins
/
contextmenu
/
plugin.js
diff --git
a/_source/plugins/contextmenu/plugin.js
b/_source/plugins/contextmenu/plugin.js
index
3f25a94
..
1c83546
100644
(file)
--- a/
_source/plugins/contextmenu/plugin.js
+++ b/
_source/plugins/contextmenu/plugin.js
@@
-54,26
+54,18
@@
CKEDITOR.plugins.contextMenu = CKEDITOR.tools.createClass(
menu = this._.menu = new CKEDITOR.menu( editor );
\r
menu.onClick = CKEDITOR.tools.bind( function( item )
\r
{
\r
menu = this._.menu = new CKEDITOR.menu( editor );
\r
menu.onClick = CKEDITOR.tools.bind( function( item )
\r
{
\r
- var noUnlock = true;
\r
menu.hide();
\r
\r
menu.hide();
\r
\r
- if ( CKEDITOR.env.ie )
\r
- menu.onEscape();
\r
-
\r
if ( item.onClick )
\r
item.onClick();
\r
else if ( item.command )
\r
editor.execCommand( item.command );
\r
\r
if ( item.onClick )
\r
item.onClick();
\r
else if ( item.command )
\r
editor.execCommand( item.command );
\r
\r
- noUnlock = false;
\r
}, this );
\r
\r
menu.onEscape = function()
\r
{
\r
editor.focus();
\r
}, this );
\r
\r
menu.onEscape = function()
\r
{
\r
editor.focus();
\r
-
\r
- if ( CKEDITOR.env.ie )
\r
- editor.getSelection().unlock( true );
\r
};
\r
}
\r
\r
};
\r
}
\r
\r
@@
-138,7
+130,7
@@
CKEDITOR.plugins.contextMenu = CKEDITOR.tools.createClass(
element.on( 'mousedown', function( evt )
\r
{
\r
evt = evt.data;
\r
element.on( 'mousedown', function( evt )
\r
{
\r
evt = evt.data;
\r
- if( evt.$.button != 2 )
\r
+ if ( evt.$.button != 2 )
\r
{
\r
if ( evt.getKeystroke() == CKEDITOR.CTRL + 1 )
\r
element.fire( 'contextmenu', evt );
\r
{
\r
if ( evt.getKeystroke() == CKEDITOR.CTRL + 1 )
\r
element.fire( 'contextmenu', evt );
\r
@@
-151,7
+143,7
@@
CKEDITOR.plugins.contextMenu = CKEDITOR.tools.createClass(
\r
var target = evt.getTarget();
\r
\r
\r
var target = evt.getTarget();
\r
\r
- if( !contextMenuOverrideButton )
\r
+ if ( !contextMenuOverrideButton )
\r
{
\r
var ownerDoc = target.getDocument();
\r
contextMenuOverrideButton = ownerDoc.createElement( 'input' ) ;
\r
{
\r
var ownerDoc = target.getDocument();
\r
contextMenuOverrideButton = ownerDoc.createElement( 'input' ) ;
\r
@@
-210,7
+202,7
@@
CKEDITOR.plugins.contextMenu = CKEDITOR.tools.createClass(
},
\r
this );
\r
\r
},
\r
this );
\r
\r
- if( CKEDITOR.env.webkit )
\r
+ if ( CKEDITOR.env.webkit )
\r
{
\r
var holdCtrlKey,
\r
onKeyDown = function( event )
\r
{
\r
var holdCtrlKey,
\r
onKeyDown = function( event )
\r