Changeset 4961

Timestamp:

06/27/08 09:00:55 (5 months ago)

Author:

marc.englund@…

Message:

Fixes #1219; although it's added specifically to Icon resources, caption (error indicator) and Embedded. Adding a global fix that goes trough all IMG -elements after each update would be a more 'global' fix, but also much heavier.

Location:

trunk

Files:

• WebContent/ITMILL/themes/default/caption/caption.css (modified) (1 diff)
• src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java (modified) (1 diff)
• src/com/itmill/toolkit/terminal/gwt/client/Util.java (modified) (1 diff)
• src/com/itmill/toolkit/terminal/gwt/client/ui/IEmbedded.java (modified) (1 diff)
• src/com/itmill/toolkit/terminal/gwt/client/ui/Icon.java (modified) (3 diffs)

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

@@ -16 +16 @@
 * html .i-errorindicator {
         margin-left:-3px;
+        background: transparent none;
+        filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src="../icons/16/error.png", sizingMethod="scale");
 }
 *+html .i-errorindicator {

trunk/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java

@@ -967 +967 @@
 
     }
+
+    /**
+     * Adds PNG-fix conditionally (only for IE6) to the specified IMG -element.
+     * 
+     * @param el
+     *                the IMG element to fix
+     */
+    public void addPngFix(Element el) {
+        BrowserInfo b = BrowserInfo.get();
+        if (b.isIE6()) {
+            Util.addPngFix(el, getThemeUri()
+                    + "/../default/common/img/blank.gif");
+        }
+    }
+
 }

trunk/src/com/itmill/toolkit/terminal/gwt/client/Util.java

@@ -125 +125 @@
         return DOM.getInnerHTML(escapeHtmlHelper);
     }
+
+    /**
+     * Adds transparent PNG fix to image element; only use for IE6.
+     * 
+     * @param el
+     *                IMG element
+     * @param blankImageUrl
+     *                URL to transparent one-pixel gif
+     */
+    public native static void addPngFix(Element el, String blankImageUrl)
+    /*-{
+        el.attachEvent("onload", function() {
+            var src = el.src;
+            if (src.indexOf(".png")<1) return;
+            var w = el.width||16; 
+            var h = el.height||16;
+            el.src =blankImageUrl;
+            el.style.height = h+"px";
+            el.style.width = w+"px";
+            el.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='"+src+"', sizingMethod='crop');";  
+        },false);
+    }-*/;
 }

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

@@ -47 +47 @@
                 setHTML("<img src=\"" + getSrc(uidl, client) + "\"" + w + h
                         + "/>");
+                client.addPngFix(DOM.getFirstChild(getElement()));
+
             } else if (type.equals("browser")) {
                 if (browserElement == null) {

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

@@ -6 +6 @@
 
 import com.google.gwt.user.client.DOM;
-import com.google.gwt.user.client.Element;
 import com.google.gwt.user.client.ui.UIObject;
 import com.itmill.toolkit.terminal.gwt.client.ApplicationConnection;
-import com.itmill.toolkit.terminal.gwt.client.BrowserInfo;
 
 public class Icon extends UIObject {
@@ -20 +18 @@
         setStyleName("i-icon");
         this.client = client;
-        BrowserInfo b = BrowserInfo.get();
-        if (b.isIE6()) {
-            addPngFix(getElement(), client.getThemeUri()
-                    + "/../default/common/img/blank.gif");
-        }
+        client.addPngFix(getElement());
     }
 
@@ -40 +34 @@
     }
 
-    private native static void addPngFix(Element el, String blankImageUrl)
-    /*-{
-        el.attachEvent("onload", function() {
-            var src = el.src;
-            if (src.indexOf(".png")<1) return;
-            var w = el.width||16; 
-            var h = el.height||16;
-            el.src =blankImageUrl;
-            el.style.height = h+"px";
-            el.style.width = w+"px";
-            el.style.filter = "progid:DXImageTransform.Microsoft.AlphaImageLoader(src='"+src+"', sizingMethod='crop');";  
-        },false);
-    }-*/;
-
 }