look at the pattern that we had:
Pattern.compile("\\[if .+\\]>(.|\n|\r)*<!\\[endif\\]-->");
and what it is now:
Pattern.compile ("\\[if .+\\]>(.|\n|\r)*<!\\[endif\\]");
see the --> is gone.
That is because the comments we test, so i take the first of below:
<!--[if IE]>
<style type="text/css">@import url( ie.css);</style>
<![endif]-->
is always just this
[if IE]>
<style type="text/css">@import url(ie.css);</style>
<![endif]
Because <!-- and --> is already stripped.
So the pattern never evaluated to true
johan
On 8/23/06, Juergen Donnerstag <
[EMAIL PROTECTED]> wrote:
Johan,
from http://de.selfhtml.org/css/layouts/browserweichen.htm you'll that
it should look like
<!--[if IE]>
<style type="text/css">@import url(ie.css);</style>
<![endif]-->
<!--[if IE 6]>
<style type="text/css">@import url(ie6.css);</style>
<![endif]-->
<!--[if gte IE 5.5]>
<style type="text/css">@import url(ie55+.css);</style>
<![endif]-->
<!--[if lte IE 5.5999]>
<style type="text/css">@import url(ie55-.css);</style>
<![endif]-->
<!--[if lt IE 5.1]>
<style type="text/css">@import url( ie50.css);</style>
<![endif]-->
based on this information, it was correct. Which pattern didn't work?
Juergen
---------- Forwarded message ----------
From: [EMAIL PROTECTED] <[EMAIL PROTECTED]>
Date: Aug 23, 2006 4:31 PM
Subject: [Wicket-autocvs] SF.net SVN: wicket: [7033]
branches/WICKET_1_2/wicket/src/java/wicket/markup/MarkupParser.java
To: [EMAIL PROTECTED]
Revision: 7033
Author: joco01
Date: 2006-08-23 07:31:32 -0700 (Wed, 23 Aug 2006)
ViewCVS: http://svn.sourceforge.net/wicket/?rev=7033&view=rev
Log Message:
-----------
wrong pattern for special comments (with if IE check) ended with -->
and that is already stripped
Modified Paths:
--------------
branches/WICKET_1_2/wicket/src/java/wicket/markup/MarkupParser.java
Modified: branches/WICKET_1_2/wicket/src/java/wicket/markup/MarkupParser.java
===================================================================
--- branches/WICKET_1_2/wicket/src/java/wicket/markup/MarkupParser.java
2006-08-23 04:29:25 UTC (rev 7032)
+++ branches/WICKET_1_2/wicket/src/java/wicket/markup/MarkupParser.java
2006-08-23 14:31:32 UTC (rev 7033)
@@ -60,7 +60,7 @@
public class MarkupParser
{
/** Conditional comment section, which is NOT treated as a
comment section */
- private static final Pattern CONDITIONAL_COMMENT =
Pattern.compile ("\\[if .+\\]>(.|\n|\r)*<!\\[endif\\]-->");
+ private static final Pattern CONDITIONAL_COMMENT =
Pattern.compile("\\[if .+\\]>(.|\n|\r)*<!\\[endif\\]");
/** The XML parser to use */
private final IXmlPullParser xmlParser;
This was sent by the SourceForge.net collaborative development
platform, the world's largest Open Source development site.
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Wicket-autocvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/wicket-autocvs
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Wicket-develop mailing list
Wicket-develop@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/wicket-develop
------------------------------------------------------------------------- Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________ Wicket-develop mailing list Wicket-develop@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/wicket-develop
