Merge branch 't/9247'

ckeditor · Oct 10, 2012 · 3bf99e1 · 3bf99e1
2 parents a49d9f7 + df3d859
commit 3bf99e1
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/plugins/clipboard/plugin.js b/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 ) ) {