vanilla ckeditor-3.6.3

[ckeditor.git] / _source / plugins / menu / plugin.js

diff --git a/_source/plugins/menu/plugin.js b/_source/plugins/menu/plugin.js
index 0165d31..265604c 100644 (file)
--- a/_source/plugins/menu/plugin.js
+++ b/_source/plugins/menu/plugin.js
@@ -1,5 +1,5 @@
 /*\r
-Copyright (c) 2003-2011, CKSource - Frederico Knabben. All rights reserved.\r
+Copyright (c) 2003-2012, CKSource - Frederico Knabben. All rights reserved.\r
 For licensing, see LICENSE.html or http://ckeditor.com/license\r
 */\r
 \r
@@ -175,10 +175,11 @@ CKEDITOR.plugins.add( 'menu',
 \r
                        onHide : function()\r
                        {\r
-                               if ( CKEDITOR.env.ie )\r
+                               // Unlock the selection upon first panel closing.\r
+                               if ( CKEDITOR.env.ie && !this.parent )\r
                                {\r
                                        var selection = this.editor.getSelection();\r
-                                       selection && selection.unlock();\r
+                                       selection && selection.unlock( true );\r
                                }\r
 \r
                                this.onHide && this.onHide();\r