Whole 'tab' clickable in IE6, fixes #2376

svn changeset:6307/svn branch:trunk

diff --git a/WebContent/ITMILL/themes/default/accordion/accordion.css b/WebContent/ITMILL/themes/default/accordion/accordion.css
index 477562e0df6840627b4f66029fec853a30e3f059..a21be68c81427a4a49339fac959ea26c76b286ca 100644 (file)
--- a/WebContent/ITMILL/themes/default/accordion/accordion.css
+++ b/WebContent/ITMILL/themes/default/accordion/accordion.css
@@ -18,11 +18,11 @@
        font-size: 15px;
        color: #656d73;
        border-top: 1px solid #c8cccd;
+       cursor: pointer;
 }
 
 .i-accordion-item-caption .i-caption {
        padding: 7px 0 6px 18px;
-       cursor: pointer;
 }
 
 .i-accordion-item-open .i-accordion-item-caption {
@@ -32,12 +32,10 @@
        border-bottom-color: #bfc9d4;
        text-shadow: #fafafa 1px 1px 0;
        border-bottom: 1px solid #c8cccd;
-}
-
-.i-accordion-item-open .i-accordion-item-caption .i-caption {
        cursor: default;
 }
 
+
 .i-accordion-item-content {
        position: absolute;
        overflow: auto;

diff --git a/WebContent/ITMILL/themes/default/styles.css b/WebContent/ITMILL/themes/default/styles.css
index 54eaef6d22d9fa0a68c0a190fdfe8775847b4ba3..c848c6e82fab795b872d94464708ba988c889f32 100644 (file)
--- a/WebContent/ITMILL/themes/default/styles.css
+++ b/WebContent/ITMILL/themes/default/styles.css
@@ -21,11 +21,11 @@
        font-size: 15px;
        color: #656d73;
        border-top: 1px solid #c8cccd;
+       cursor: pointer;
 }
 
 .i-accordion-item-caption .i-caption {
        padding: 7px 0 6px 18px;
-       cursor: pointer;
 }
 
 .i-accordion-item-open .i-accordion-item-caption {
@@ -35,12 +35,10 @@
        border-bottom-color: #bfc9d4;
        text-shadow: #fafafa 1px 1px 0;
        border-bottom: 1px solid #c8cccd;
-}
-
-.i-accordion-item-open .i-accordion-item-caption .i-caption {
        cursor: default;
 }
 
+
 .i-accordion-item-content {
        position: absolute;
        overflow: auto;

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IAccordion.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IAccordion.java
index 41dfae18f97e6ba6cec97fe75c6a591e6b54e278..6a7ad121bb62b09cd7bc67354af6fabf78851669 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IAccordion.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IAccordion.java
@@ -8,6 +8,7 @@ import java.util.Set;
 
 import com.google.gwt.user.client.DOM;
 import com.google.gwt.user.client.Element;
+import com.google.gwt.user.client.Event;
 import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.ComplexPanel;
 import com.google.gwt.user.client.ui.Widget;
@@ -328,8 +329,8 @@ public class IAccordion extends ITabsheetBase implements
             }
 
             int captionWidth = caption.getRequiredWidth();
-            int padding = Util.measureHorizontalPaddingAndBorder(caption.getElement(),
-                    18);
+            int padding = Util.measureHorizontalPaddingAndBorder(caption
+                    .getElement(), 18);
             return captionWidth + padding;
         }
 
@@ -358,6 +359,10 @@ public class IAccordion extends ITabsheetBase implements
             setElement(DOM.createDiv());
             caption = new ICaption(null, client);
             caption.addClickListener(this);
+            if (BrowserInfo.get().isIE6()) {
+                DOM.setEventListener(captionNode, this);
+                DOM.sinkEvents(captionNode, Event.BUTTON_LEFT);
+            }
             super.add(caption, captionNode);
             DOM.appendChild(captionNode, caption.getElement());
             DOM.appendChild(getElement(), captionNode);
@@ -372,6 +377,10 @@ public class IAccordion extends ITabsheetBase implements
             updateCaption(tabUidl);
         }
 
+        public void onBrowserEvent(Event event) {
+            onSelectTab(this);
+        }
+
         public Element getContainerElement() {
             return content;
         }