Author: sshyrkov
Date: Mon Oct 15 11:46:57 2007
New Revision: 18859
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18859&repname=
=3Djahia
Log:
Apply PNG fix only for Internet Explorer version <=3D 6.0
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/deprecated/taglibs=
/util/JSToolsTag.java
branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/util/JSToo=
lsTag.java
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/deprecated/t=
aglibs/util/JSToolsTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/deprecated/taglibs/util/JSToolsTag.java&rev=
=3D18859&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/deprecated/taglibs=
/util/JSToolsTag.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/deprecated/taglibs=
/util/JSToolsTag.java Mon Oct 15 11:46:57 2007
@@ -40,18 +40,10 @@
final JspWriter out =3D pageContext.getOut();
out.print("<script type=3D\"text/javascript\" src=3D\"");
out.print(jData.getProcessingContext().settings().getJsHttpPat=
h());
- out.print("\"></script>\n");
-
- // Add reference to pngbehavior htc file
- /*
- <style type=3D"text/css">
- img {
- behavior: url("pngbehavior.htc");
- }
- </style>
- */
+ out.println("\"></script>");
String navigator =3D request.getHeader("User-Agent");
if (navigator!=3Dnull && !navigator.equals("") && navigator.in=
dexOf("MSIE") !=3D -1) {
+ out.println("<!--[if lte IE 6]>");
out.println("<style type=3D\"text/css\">");
out.println("img {");
out.print("behavior: url(\"");
@@ -59,6 +51,7 @@
out.print("/jsp/jahia/css/pngbehavior.jsp\")");
out.println("}");
out.println("</style>");
+ out.println("<![endif]-->");
}
=
} catch (IOException ioe) {
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/util=
/JSToolsTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/java/org/jahia/taglibs/util/JSToolsTag.java&rev=3D18859&re=
pname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/util/JSToo=
lsTag.java (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/java/org/jahia/taglibs/util/JSToo=
lsTag.java Mon Oct 15 11:46:57 2007
@@ -55,16 +55,8 @@
final JspWriter out =3D pageContext.getOut();
out.print("<script type=3D\"text/javascript\" src=3D\"");
out.print(jData.getProcessingContext().settings().getJsHttpPat=
h());
- out.print("\"></script>\n");
-
- // Add reference to pngbehavior htc file
- /*
- <style type=3D"text/css">
- img {
- behavior: url("pngbehavior.htc");
- }
- </style>
- */
+ out.println("\"></script>");
+ out.println("<!--[if lte IE 6]>");
out.println("<style type=3D\"text/css\">");
out.println("img {");
out.print("behavior: url(\"");
@@ -72,6 +64,7 @@
out.print("/jsp/jahia/css/pngbehavior.jsp\")");
out.println("}");
out.println("</style>");
+ out.println("<![endif]-->");
=
} catch (IOException ioe) {
JahiaConsole.println("JSToolsTag: doStartTag ", ioe.toString()=
);
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
