From: Automerge <automerge@vaadin.com>
Date: Thu, 22 Mar 2012 14:07:26 +0000 (+0000)
Subject: [merge from 6.7] Fixed #8524 - properly update currentDrag elementOver in all cases
X-Git-Tag: 7.0.0.alpha2~230^2~2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=483df08ee0517f14f958266e7a057313ed1300f1;p=vaadin-framework.git

[merge from 6.7] Fixed #8524 - properly update currentDrag elementOver in all cases

svn changeset:23285/svn branch:6.8
---

diff --git a/src/com/vaadin/terminal/gwt/client/ui/dd/VDragAndDropManager.java b/src/com/vaadin/terminal/gwt/client/ui/dd/VDragAndDropManager.java
index dbeff243a8..74ab1dcc47 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/dd/VDragAndDropManager.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/dd/VDragAndDropManager.java
@@ -167,6 +167,8 @@ public class VDragAndDropManager {
                     // ApplicationConnection.getConsole().log(
                     // "DropHandler now"
                     // + currentDropHandler.getPaintable());
+                    currentDrag
+                            .setElementOver((com.google.gwt.user.client.Element) targetElement);
                     target.dragEnter(currentDrag);
                 } else if (target == null && currentDropHandler != null) {
                     // ApplicationConnection.getConsole().log("Invalid state!?");
@@ -197,6 +199,8 @@ public class VDragAndDropManager {
             case Event.ONMOUSEMOVE:
             case Event.ONTOUCHMOVE:
                 if (currentDropHandler != null) {
+                    currentDrag
+                            .setElementOver((com.google.gwt.user.client.Element) targetElement);
                     currentDropHandler.dragOver(currentDrag);
                 }
                 nativeEvent.preventDefault();