#6902 Table empties field on Layout.replaceComponent

svn changeset:22788/svn branch:6.7

1 files changed, 12 insertions, 0 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index 553934bf98..f7d23d4453 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -2592,6 +2592,17 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
                     break;
                 }
                 break;
+            case Event.ONCONTEXTMENU:
+                if (client.hasEventListeners(VScrollTable.this,
+                        HEADER_CLICK_EVENT_ID)) {
+                    // Prevent showing the browser's context menu when there is
+                    // a right click listener.
+                    event.preventDefault();
+                }
+                break;
+            case Event.ONDBLCLICK:
+                fireHeaderClickedEvent(event);
+                break;
             case Event.ONTOUCHMOVE:
             case Event.ONMOUSEMOVE:
                 if (dragging) {
@@ -4736,6 +4747,7 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
                         Paintable paintable = client.getPaintable(uidl);
                         paintable.updateFromUIDL(uidl, client);
                     }
+                    pendingComponentPaints.clear();
                 }
             }