4 files changed, 8 insertions, 35 deletions

diff --git a/WebContent/VAADIN/themes/base/treetable/img/arrow-down.gif b/WebContent/VAADIN/themes/base/treetable/img/arrow-down.gif
new file mode 100644
index 0000000000..ad599674a1
--- /dev/null
+++ b/WebContent/VAADIN/themes/base/treetable/img/arrow-down.gif
diff --git a/WebContent/VAADIN/themes/base/treetable/img/arrow-right.gif b/WebContent/VAADIN/themes/base/treetable/img/arrow-right.gif
new file mode 100644
index 0000000000..cbe21ac7c0
--- /dev/null
+++ b/WebContent/VAADIN/themes/base/treetable/img/arrow-right.gif
diff --git a/WebContent/VAADIN/themes/base/treetable/treetable.css b/WebContent/VAADIN/themes/base/treetable/treetable.css
index 2dd2b92197..f1fcf25542 100644
--- a/WebContent/VAADIN/themes/base/treetable/treetable.css
+++ b/WebContent/VAADIN/themes/base/treetable/treetable.css
@@ -1,7 +1,6 @@
 .v-treetable-treespacer {
     display: inline-block;
     background: transparent;
-    position: relative;
     height: 9px;
     /* defines the amount of indent per level */
     width: 18px;
@@ -14,32 +13,17 @@
     background: url(../treetable/img/arrow-right.png) right center no-repeat;
 }
 
+.v-ie6 .v-treetable-node-closed {
+	background-image: url(../treetable/img/arrow-right.gif); 
+} 
+
 .v-treetable-node-open {
     background: url(../treetable/img/arrow-down.png) right center no-repeat;
 }
 
-/* Show the tree arrows in a separate element in IE 6 to emulate background-position: right when using AlphaImageLoader */
-.v-ie6 .v-treetable-node-closed, .v-ie6 .v-treetable-node-open  {
-	background-image: none;
-}
-
-.v-treetable-spacer-ie {
-	position: absolute;
-	height: 9px;
-	width: 10px;
-	right: 0;
-	top: -1px;
-}
-
-.v-treetable-node-closed .v-treetable-spacer-ie {
-	/* vaadin.setAlphaImageLoader used to get relative paths (relative to the themeUrl) with AlphaImageLoader */
-	zoom: expression((function(e) {vaadin.setAlphaImageLoader(e, "../base/treetable/img/arrow-right.png")})(this));
-}
-
-.v-treetable-node-open .v-treetable-spacer-ie {
-	/* vaadin.setAlphaImageLoader used to get relative paths (relative to the themeUrl) with AlphaImageLoader */
-	zoom: expression((function(e) {vaadin.setAlphaImageLoader(e, "../base/treetable/img/arrow-down.png")})(this));
-}
+.v-ie6 .v-treetable-node-open {
+	background-image: url(../treetable/img/arrow-down.gif); 
+} 
 
 .v-treetable .v-checkbox {
 	display: inline-block;
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTreeTable.java b/src/com/vaadin/terminal/gwt/client/ui/VTreeTable.java
index b3b24b3f39..ecc065e117 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/VTreeTable.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/VTreeTable.java
@@ -192,16 +192,6 @@ public class VTreeTable extends VScrollTable {
 
                     treeSpacer = Document.get().createSpanElement();
 
-                    if (BrowserInfo.get().isIE6()) {
-                        // Must add an absolutely positioned element with right:
-                        // 0 to get the background aligned to the right in IE 6
-                        // where AlphaImageLoader is used for the background
-                        SpanElement ieSpacerHolder = Document.get()
-                                .createSpanElement();
-                        ieSpacerHolder.addClassName("v-treetable-spacer-ie");
-                        treeSpacer.insertFirst(ieSpacerHolder);
-                    }
-
                     treeSpacer.setClassName(classname);
                     container.insertFirst(treeSpacer);
                     depth = rowUidl.hasAttribute("depth") ? rowUidl
@@ -223,8 +213,7 @@ public class VTreeTable extends VScrollTable {
 
             @Override
             public void onBrowserEvent(Event event) {
-                SpanElement target = event.getEventTarget().cast();
-                if ((target == treeSpacer || target.getParentElement() == treeSpacer)
+                if (event.getEventTarget().cast() == treeSpacer
                         && treeSpacer.getClassName().contains("node")) {
                     if (event.getTypeInt() == Event.ONMOUSEUP) {
                         sendToggleCollapsedUpdate(getKey());