Changeset 5271

Timestamp:

08/26/08 13:09:50 (3 months ago)

Author:

matti.tahvonen@…

Message:

fixes #1245 (ITree in IOrderedLayout in IE6)

Location:

trunk

Files:

• WebContent/ITMILL/themes/default/styles.css (modified) (2 diffs)
• WebContent/ITMILL/themes/default/tree/tree.css (modified) (2 diffs)
• src/com/itmill/toolkit/terminal/gwt/client/ui/ITree.java (modified) (3 diffs)

trunk/WebContent/ITMILL/themes/default/styles.css

@@ -2171 +2171 @@
 }
 
+/* ie6compatnode is hidden from non ie6 browsers, for ie6 
+ * uses weird hack to sink all events properly 
+ */
+.i-tree-node-ie6compatnode {
+        display: none;
+}
+
+* html .i-tree-node-ie6compatnode {
+        display: inline;
+        float:left;
+        background: orange;
+        margin:0;
+        width:14px;
+        height:10px;
+        padding:1px;
+        filter: Alpha(opacity=0);
+}
+* html .i-tree-node {
+        clear: both;
+}
+
 .i-tree-node {
         background: transparent url(tree/img/collapsed.png) no-repeat 2px 1px;
@@ -2183 +2204 @@
         margin-left: 16px;
 }
+
 .i-tree-node span {
         padding: 0 2px;

trunk/WebContent/ITMILL/themes/default/tree/tree.css

@@ -1 +1 @@
 .i-tree {
         text-align: left /* Force default alignment */
+}
+
+/* ie6compatnode is hidden from non ie6 browsers, for ie6 
+ * uses weird hack to sink all events properly 
+ */
+.i-tree-node-ie6compatnode {
+        display: none;
+}
+
+* html .i-tree-node-ie6compatnode {
+        display: inline;
+        float:left;
+        background: orange;
+        margin:0;
+        width:14px;
+        height:10px;
+        padding:1px;
+        filter: Alpha(opacity=0);
+}
+* html .i-tree-node {
+        clear: both;
 }
 
@@ -15 +36 @@
         margin-left: 16px;
 }
+
 .i-tree-node span {
         padding: 0 2px;

trunk/src/com/itmill/toolkit/terminal/gwt/client/ui/ITree.java

@@ -186 +186 @@
         private Icon icon;
 
+        private Element ie6compatnode;
+
         public TreeNode() {
             constructDom();
@@ -196 +198 @@
                 return;
             }
-            final Element target = DOM.eventGetTarget(event);
-            if (DOM.compare(getElement(), target)) {
-                // state change
-                toggleState();
-            } else if (!readonly && DOM.compare(target, nodeCaptionSpan)) {
-                // caption click = selection change
-                toggleSelection();
+            if (DOM.eventGetType(event) == Event.ONCLICK) {
+                final Element target = DOM.eventGetTarget(event);
+                if (DOM.compare(getElement(), target)
+                        || DOM.compare(ie6compatnode, target)) {
+                    // state change
+                    toggleState();
+                } else if (!readonly && DOM.compare(target, nodeCaptionSpan)) {
+                    // caption click = selection change
+                    toggleSelection();
+                }
+                DOM.eventCancelBubble(event, true);
+            } else {
+                ApplicationConnection.getConsole().log(
+                        "ITree event?? " + DOM.eventToString(event));
             }
 
@@ -218 +227 @@
 
         protected void constructDom() {
+            // workaround for a very weird IE6 issue #1245
+            ie6compatnode = DOM.createDiv();
+            setStyleName(ie6compatnode, CLASSNAME + "-ie6compatnode");
+            DOM.setInnerText(ie6compatnode, " ");
+            DOM.appendChild(getElement(), ie6compatnode);
+
+            DOM.sinkEvents(ie6compatnode, Event.ONCLICK);
+
             nodeCaptionDiv = DOM.createDiv();
             DOM.setElementProperty(nodeCaptionDiv, "className", CLASSNAME