Merge from 6.2 for fix [11755]

svn changeset:11770/svn branch:6.3

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTree.java b/src/com/vaadin/terminal/gwt/client/ui/VTree.java
index f65782f05bdd52981557c8284ec18636f69e9e5d..d78196ed43adab7f12ccbd3afaf665a85808ae1f 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VTree.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTree.java
@@ -731,6 +731,12 @@ public class VTree extends FlowPanel implements Paintable, VHasDropHandler {
                 fixWidth();
             }
         }
+
+        @Override
+        protected void onDetach() {
+            super.onDetach();
+            client.getContextMenu().ensureHidden(this);
+        }
     }
 
     public VDropHandler getDropHandler() {