Skip to content
Permalink
Browse files

Merge branch 't/9247'

  • Loading branch information...
Reinmar committed Oct 10, 2012
2 parents a49d9f7 + df3d859 commit 3bf99e176f5b01a09ff4663bd533d364bb8810f6
Showing with 6 additions and 0 deletions.
  1. +6 −0 plugins/clipboard/plugin.js
@@ -754,9 +754,15 @@
// we're canceling it.
preventPasteEventNow();

// #9247: Lock focus to prevent IE from hiding toolbar for inline editor.
var focusManager = editor.focusManager;
focusManager.lock();

if ( editor.editable().fire( mainPasteEvent ) && !execIECommand( 'paste' ) ) {
focusManager.unlock();
return false;
}
focusManager.unlock();
} else {
try {
if ( editor.editable().fire( mainPasteEvent ) && !editor.document.$.execCommand( 'Paste', false, null ) ) {

0 comments on commit 3bf99e1

Please sign in to comment.
You can’t perform that action at this time.