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.2.2
[ckeditor.git]
/
_source
/
plugins
/
contextmenu
/
plugin.js
diff --git
a/_source/plugins/contextmenu/plugin.js
b/_source/plugins/contextmenu/plugin.js
index
60aad92
..
b009dee
100644
(file)
--- a/
_source/plugins/contextmenu/plugin.js
+++ b/
_source/plugins/contextmenu/plugin.js
@@
-36,14
+36,14
@@
CKEDITOR.plugins.contextMenu = CKEDITOR.tools.createClass(
},
\r
this);
\r
\r
},
\r
this);
\r
\r
- this._.definiton =
\r
+ this.definition =
\r
{
\r
panel:
\r
{
\r
className : editor.skinClass + ' cke_contextmenu',
\r
attributes :
\r
{
\r
{
\r
panel:
\r
{
\r
className : editor.skinClass + ' cke_contextmenu',
\r
attributes :
\r
{
\r
- 'aria-label' : editor.lang.common.options
\r
+ 'aria-label' : editor.lang.contextmenu.options
\r
}
\r
}
\r
};
\r
}
\r
}
\r
};
\r
@@
-63,7
+63,7
@@
CKEDITOR.plugins.contextMenu = CKEDITOR.tools.createClass(
}
\r
else
\r
{
\r
}
\r
else
\r
{
\r
- menu = this._.menu = new CKEDITOR.menu( editor, this._.definiton );
\r
+ menu = this._.menu = new CKEDITOR.menu( editor, this.definition );
\r
menu.onClick = CKEDITOR.tools.bind( function( item )
\r
{
\r
menu.hide();
\r
menu.onClick = CKEDITOR.tools.bind( function( item )
\r
{
\r
menu.hide();
\r
@@
-167,7
+167,7
@@
CKEDITOR.plugins.contextMenu = CKEDITOR.tools.createClass(
}
\r
\r
if ( nativeContextMenuOnCtrl
\r
}
\r
\r
if ( nativeContextMenuOnCtrl
\r
- && ( evt.$.ctrlKey || evt.$.metaKey ) )
\r
+ && ( CKEDITOR.env.mac ? evt.$.metaKey : evt.$.ctrlKey ) )
\r
return;
\r
\r
var target = evt.getTarget();
\r
return;
\r
\r
var target = evt.getTarget();
\r
@@
-205,16
+205,9
@@
CKEDITOR.plugins.contextMenu = CKEDITOR.tools.createClass(
if ( nativeContextMenuOnCtrl &&
\r
// Safari on Windows always show 'ctrlKey' as true in 'contextmenu' event,
\r
// which make this property unreliable. (#4826)
\r
if ( nativeContextMenuOnCtrl &&
\r
// Safari on Windows always show 'ctrlKey' as true in 'contextmenu' event,
\r
// which make this property unreliable. (#4826)
\r
- ( CKEDITOR.env.webkit ? holdCtrlKey : domEvent.$.ctrlKey || domEvent.$.metaKey ) )
\r
+ ( CKEDITOR.env.webkit ? holdCtrlKey : ( CKEDITOR.env.mac ? domEvent.$.metaKey : domEvent.$.ctrlKey ) ) )
\r
return;
\r
\r
return;
\r
\r
- // Selection will be unavailable after context menu shows up
\r
- // in IE, lock it now.
\r
- if ( CKEDITOR.env.ie )
\r
- {
\r
- var selection = this.editor.getSelection();
\r
- selection && selection.lock();
\r
- }
\r
\r
// Cancel the browser context menu.
\r
domEvent.preventDefault();
\r
\r
// Cancel the browser context menu.
\r
domEvent.preventDefault();
\r
@@
-236,7
+229,7
@@
CKEDITOR.plugins.contextMenu = CKEDITOR.tools.createClass(
var holdCtrlKey,
\r
onKeyDown = function( event )
\r
{
\r
var holdCtrlKey,
\r
onKeyDown = function( event )
\r
{
\r
- holdCtrlKey = event.data.$.ctrlKey || event.data.$.metaKey;
\r
+ holdCtrlKey = CKEDITOR.env.mac ? event.data.$.metaKey : event.data.$.ctrlKey ;
\r
},
\r
resetOnKeyUp = function()
\r
{
\r
},
\r
resetOnKeyUp = function()
\r
{
\r
@@
-257,6
+250,15
@@
CKEDITOR.plugins.contextMenu = CKEDITOR.tools.createClass(
show : function( offsetParent, corner, offsetX, offsetY )
\r
{
\r
this.editor.focus();
\r
show : function( offsetParent, corner, offsetX, offsetY )
\r
{
\r
this.editor.focus();
\r
+
\r
+ // Selection will be unavailable after context menu shows up
\r
+ // in IE, lock it now.
\r
+ if ( CKEDITOR.env.ie )
\r
+ {
\r
+ var selection = this.editor.getSelection();
\r
+ selection && selection.lock();
\r
+ }
\r
+
\r
this._.onMenu( offsetParent || CKEDITOR.document.getDocumentElement(), corner, offsetX || 0, offsetY || 0 );
\r
}
\r
}
\r
this._.onMenu( offsetParent || CKEDITOR.document.getDocumentElement(), corner, offsetX || 0, offsetY || 0 );
\r
}
\r
}
\r