summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Alhroos <john.ahlroos@itmill.com>2012-08-22 08:40:32 +0000
committerJohn Alhroos <john.ahlroos@itmill.com>2012-08-22 08:40:32 +0000
commit1596ed4fc077bfb40cceb5cc71218aea05740d59 (patch)
tree80f0daee13773a8c67058aed10e352d24cbdff37
parentfb8c447ca2f78923600426a76dba99e7875c4dc5 (diff)
downloadvaadin-framework-1596ed4fc077bfb40cceb5cc71218aea05740d59.tar.gz
vaadin-framework-1596ed4fc077bfb40cceb5cc71218aea05740d59.zip
Fixed issue in IE6 and IE7 as well #6217
svn changeset:24215/svn branch:6.8
-rw-r--r--src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java25
1 files changed, 20 insertions, 5 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
index 39aed5b64b..8f8401800d 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java
@@ -5557,9 +5557,14 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
if (dragmode == DRAGMODE_MULTIROW && isMultiSelectModeAny()
&& rowKeyIsSelected(rowKey)) {
- // Create a drag image of ALL rows
- ev.createDragImage(
- (Element) scrollBody.tBodyElement.cast(), true);
+ // Create a drag image of ALL rows (ie6,7 has a different
+ // DOM structure)
+ if(BrowserInfo.get().isIE6() || BrowserInfo.get().isIE7()){
+ ev.createDragImage(scrollBody.getElement(), true);
+ } else {
+ ev.createDragImage(
+ (Element) scrollBody.tBodyElement.cast(), true);
+ }
// Hide rows which are not selected
Element dragImage = ev.getDragImage();
@@ -5568,9 +5573,19 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
.hasNext();) {
VScrollTableRow next = (VScrollTableRow) iterator
.next();
- Element child = (Element) dragImage.getChild(i++);
+
+ Element child;
+ if(BrowserInfo.get().isIE6() || BrowserInfo.get().isIE7()){
+ child = (Element) dragImage.getChild(1)
+ .getChild(0)
+ .getChild(i++);
+ } else {
+ child = (Element) dragImage.getChild(i++);
+ }
+
if (!rowKeyIsSelected(next.rowKey)) {
- child.getStyle().setVisibility(Visibility.HIDDEN);
+ child.getStyle().setVisibility(
+ Visibility.HIDDEN);
}
}
} else {