Merge #5776 and #5772 from 6.4 to 6.5

svn changeset:15633/svn branch:6.5

diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index 346c46871f896024f3b42a9b08603aa5eca6e9f0..8ad782411dffe7e606344232068c35547f78e9eb 100644 (file)
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -2762,6 +2762,8 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
                 if (DOM.eventGetType(event) == Event.ONMOUSEUP) {
                     scrollBodyPanel.setFocus(true);
                 }
+                event.stopPropagation();
+                event.preventDefault();
             }
         }
 

diff --git a/tests/integration-testscripts/integration-test-GateIn-3.1.0-sampler.html b/tests/integration-testscripts/integration-test-GateIn-3.1.0-sampler.html
index 29fea4f77f14e8d8d58074b3d37c697e739d68cd..6eaf900e4c62db52a576e9beea8d56f7f443c3b1 100644 (file)
--- a/tests/integration-testscripts/integration-test-GateIn-3.1.0-sampler.html
+++ b/tests/integration-testscripts/integration-test-GateIn-3.1.0-sampler.html
@@ -32,7 +32,7 @@
        <td>93,13</td>
 </tr>
 <tr>
-       <td>expectDialog</td>
+       <td>mouseClick</td>
        <td>//div[2]/div[2]/div[1]/div[1]/div[2]</td>
        <td>73,18</td>
 </tr>