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
[ckeditor.git]
/
_source
/
plugins
/
contextmenu
/
plugin.js
diff --git
a/_source/plugins/contextmenu/plugin.js
b/_source/plugins/contextmenu/plugin.js
index
6cbc3e7
..
3f25a94
100644
(file)
--- a/
_source/plugins/contextmenu/plugin.js
+++ b/
_source/plugins/contextmenu/plugin.js
@@
-1,5
+1,5
@@
/*
\r
/*
\r
-Copyright (c) 2003-2009, CKSource - Frederico Knabben. All rights reserved.
\r
+Copyright (c) 2003-2010, CKSource - Frederico Knabben. All rights reserved.
\r
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
*/
\r
\r
For licensing, see LICENSE.html or http://ckeditor.com/license
\r
*/
\r
\r
@@
-83,17
+83,15
@@
CKEDITOR.plugins.contextMenu = CKEDITOR.tools.createClass(
var selection = this.editor.getSelection(),
\r
element = selection && selection.getStartElement();
\r
\r
var selection = this.editor.getSelection(),
\r
element = selection && selection.getStartElement();
\r
\r
- // Lock the selection in IE, so it can be restored when closing the
\r
- // menu.
\r
- if ( CKEDITOR.env.ie )
\r
- selection.lock();
\r
-
\r
menu.onHide = CKEDITOR.tools.bind( function()
\r
{
\r
menu.onHide = null;
\r
\r
if ( CKEDITOR.env.ie )
\r
menu.onHide = CKEDITOR.tools.bind( function()
\r
{
\r
menu.onHide = null;
\r
\r
if ( CKEDITOR.env.ie )
\r
- editor.getSelection().unlock();
\r
+ {
\r
+ var selection = editor.getSelection();
\r
+ selection && selection.unlock();
\r
+ }
\r
\r
this.onHide && this.onHide();
\r
},
\r
\r
this.onHide && this.onHide();
\r
},
\r
@@
-189,6
+187,14
@@
CKEDITOR.plugins.contextMenu = CKEDITOR.tools.createClass(
( CKEDITOR.env.webkit ? holdCtrlKey : domEvent.$.ctrlKey || domEvent.$.metaKey ) )
\r
return;
\r
\r
( CKEDITOR.env.webkit ? holdCtrlKey : domEvent.$.ctrlKey || domEvent.$.metaKey ) )
\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
\r