summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorAnna Koskinen <anna@vaadin.com>2013-01-09 16:32:13 +0200
committerAnna Koskinen <anna@vaadin.com>2013-01-09 16:32:13 +0200
commit039c201b825121fe5e068bf6e127eb2ee6f8e489 (patch)
tree6ad014f85a9baf6afc74bff779c7fbfef17a9eea /client
parent488259c57d55e5cfdc82f2e0197da3746f4413e1 (diff)
downloadvaadin-framework-039c201b825121fe5e068bf6e127eb2ee6f8e489.tar.gz
vaadin-framework-039c201b825121fe5e068bf6e127eb2ee6f8e489.zip
Merge of (#10200) to Vaadin 7.
DnD broken in IE8 when Vaadin app running in iframe. Change-Id: Ie1e8655729bc5e83e868fb31d4e897ce41f13f92
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/Util.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/client/src/com/vaadin/client/Util.java b/client/src/com/vaadin/client/Util.java
index 6947b14d9d..a29398706d 100644
--- a/client/src/com/vaadin/client/Util.java
+++ b/client/src/com/vaadin/client/Util.java
@@ -77,6 +77,8 @@ public class Util {
public static native Element getElementFromPoint(int clientX, int clientY)
/*-{
var el = $wnd.document.elementFromPoint(clientX, clientY);
+ // Call elementFromPoint two times to make sure IE8 also returns something sensible if the application is running in an iframe
+ el = $wnd.document.elementFromPoint(clientX, clientY);
if(el != null && el.nodeType == 3) {
el = el.parentNode;
}