Re: [xwiki-devs] [xwiki-notifications] r21360 - in platform/core/branches/xwiki-core-1.8/xwiki-xml/src: main/java/org/xwiki/xml test/java/org/xwiki/xml/internal/html
26 Jun
2009
26 Jun
'09
8:37 p.m.
vmassol (SVN) wrote:
Author: vmassol
Date: 2009-06-19 21:18:47 +0200 (Fri, 19 Jun 2009)
New Revision: 21360
Modified:
platform/core/branches/xwiki-core-1.8/xwiki-xml/src/main/java/org/xwiki/xml/XMLUtils.java
platform/core/branches/xwiki-core-1.8/xwiki-xml/src/test/java/org/xwiki/xml/internal/html/DefaultHTMLCleanerTest.java
Log:
XWIKI-4005: HMTL Cleaner should not expand empty elements for BR and HR in order to
support IE6
Modified:
platform/core/branches/xwiki-core-1.8/xwiki-xml/src/main/java/org/xwiki/xml/XMLUtils.java
===================================================================
---
platform/core/branches/xwiki-core-1.8/xwiki-xml/src/main/java/org/xwiki/xml/XMLUtils.java 2009-06-19
16:35:08 UTC (rev 21359)
+++
platform/core/branches/xwiki-core-1.8/xwiki-xml/src/main/java/org/xwiki/xml/XMLUtils.java 2009-06-19
19:18:47 UTC (rev 21360)
@@ -213,7 +225,16 @@
format.setOmitDeclaration(omitDeclaration);
XMLOutputter outputter = new XWikiXMLOutputter(format, omitDoctype);
- return outputter.outputString(jdomDoc);
+ String result = outputter.outputString(jdomDoc);
+
+ // Since we need to support IE6 we must generate compact form for the following
HTML elements (otherwise they
+ // won't be understood by IE6):
+ for (String specialElement : OMIT_ELEMENT_CLOSE_SET) {
+ result =
result.replaceAll(MessageFormat.format("<{0}></{0}>",
specialElement),
Shouldn't this be something like "<{0}[^>]*+></{0}>"? I doubt
that there
really is <img></img>, and if it is, it won't make much difference which
way it's written.
+
MessageFormat.format("<{0}/>", specialElement));
+ }
+
+ return result;
--
Sergiu Dumitriu
http://purl.org/net/sergiu/
27 Jun
27 Jun
9:24 a.m.
New subject: [xwiki-devs] [xwiki-notifications] r21360 - in platform/core/branches/xwiki-core-1.8/xwiki-xml/src: main/java/org/xwiki/xml test/java/org/xwiki/xml/internal/html
On Jun 26, 2009, at 8:37 PM, Sergiu Dumitriu wrote:
vmassol (SVN) wrote:
This is not a regex but a simple MessageFormat.format(). BTW A Regex
would probably be better since the Pattern could be precompiled (at
the expense of more complex code though).
-Vincent
Author: vmassol
Date: 2009-06-19 21:18:47 +0200 (Fri, 19 Jun 2009)
New Revision: 21360
Modified:
platform/core/branches/xwiki-core-1.8/xwiki-xml/src/main/java/org/
xwiki/xml/XMLUtils.java
platform/core/branches/xwiki-core-1.8/xwiki-xml/src/test/java/org/
xwiki/xml/internal/html/DefaultHTMLCleanerTest.java
Log:
XWIKI-4005: HMTL Cleaner should not expand empty elements for BR
and HR in order to support IE6
Modified: platform/core/branches/xwiki-core-1.8/xwiki-xml/src/main/
java/org/xwiki/xml/XMLUtils.java
===================================================================
--- platform/core/branches/xwiki-core-1.8/xwiki-xml/src/main/java/
org/xwiki/xml/XMLUtils.java 2009-06-19 16:35:08 UTC (rev 21359)
+++ platform/core/branches/xwiki-core-1.8/xwiki-xml/src/main/java/
org/xwiki/xml/XMLUtils.java 2009-06-19 19:18:47 UTC (rev 21360)
@@ -213,7 +225,16 @@
format.setOmitDeclaration(omitDeclaration);
XMLOutputter outputter = new XWikiXMLOutputter(format,
omitDoctype);
- return outputter.outputString(jdomDoc);
+ String result = outputter.outputString(jdomDoc);
+
+ // Since we need to support IE6 we must generate compact
form for the following HTML elements (otherwise they
+ // won't be understood by IE6):
+ for (String specialElement : OMIT_ELEMENT_CLOSE_SET) {
+ result =
result.replaceAll(MessageFormat.format("<{0}></{0}>",
specialElement),
Shouldn't this be something like "<{0}[^>]*+></{0}>"? I
doubt that
there
really is <img></img>, and if it is, it won't make much difference
which
way it's written.
> + MessageFormat.format("<{0}/>", specialElement));
> + }
> +
> + return result;
10:16 a.m.
New subject: [xwiki-devs] [xwiki-notifications] r21360 - in platform/core/branches/xwiki-core-1.8/xwiki-xml/src: main/java/org/xwiki/xml test/java/org/xwiki/xml/internal/html
Vincent Massol wrote:
On Jun 26, 2009, at 8:37 PM, Sergiu Dumitriu wrote:
No, it is a regexp. The result of the MessageFormat is used for
replaceAll, which treats the first argument as a regexp.
vmassol (SVN) wrote:
This is not a regex but a simple MessageFormat.format(). BTW A Regex
would probably be better since the Pattern could be precompiled (at
the expense of more complex code though).
Author: vmassol
Date: 2009-06-19 21:18:47 +0200 (Fri, 19 Jun 2009)
New Revision: 21360
Modified:
platform/core/branches/xwiki-core-1.8/xwiki-xml/src/main/java/org/
xwiki/xml/XMLUtils.java
platform/core/branches/xwiki-core-1.8/xwiki-xml/src/test/java/org/
xwiki/xml/internal/html/DefaultHTMLCleanerTest.java
Log:
XWIKI-4005: HMTL Cleaner should not expand empty elements for BR
and HR in order to support IE6
Modified: platform/core/branches/xwiki-core-1.8/xwiki-xml/src/main/
java/org/xwiki/xml/XMLUtils.java
===================================================================
--- platform/core/branches/xwiki-core-1.8/xwiki-xml/src/main/java/
org/xwiki/xml/XMLUtils.java 2009-06-19 16:35:08 UTC (rev 21359)
+++ platform/core/branches/xwiki-core-1.8/xwiki-xml/src/main/java/
org/xwiki/xml/XMLUtils.java 2009-06-19 19:18:47 UTC (rev 21360)
@@ -213,7 +225,16 @@
format.setOmitDeclaration(omitDeclaration);
XMLOutputter outputter = new XWikiXMLOutputter(format,
omitDoctype);
- return outputter.outputString(jdomDoc);
+ String result = outputter.outputString(jdomDoc);
+
+ // Since we need to support IE6 we must generate compact
form for the following HTML elements (otherwise they
+ // won't be understood by IE6):
+ for (String specialElement : OMIT_ELEMENT_CLOSE_SET) {
+ result =
result.replaceAll(MessageFormat.format("<{0}></{0}>",
specialElement),
Shouldn't this be something like
"<{0}[^>]*+></{0}>"? I doubt that
there
really is <img></img>, and if it is, it won't make much difference
which
way it's written.
>> + MessageFormat.format("<{0}/>",
specialElement));
>> + }
>> +
>> + return result;
--
Sergiu Dumitriu
http://purl.org/net/sergiu/
10:31 a.m.
New subject: [xwiki-devs] [xwiki-notifications] r21360 - in platform/core/branches/xwiki-core-1.8/xwiki-xml/src: main/java/org/xwiki/xml test/java/org/xwiki/xml/internal/html
On Jun 27, 2009, at 10:16 AM, Sergiu Dumitriu wrote:
Vincent Massol wrote:
ah right :)
Now I don't understand your regex does.
I understand it would replace for ex "<imghello whatever></img>".
Why
would we want this?
It's very likely I don't understand the regex you pasted since it
doesnt make sense to me.
Thanks
-Vincent
On Jun 26, 2009, at 8:37 PM, Sergiu Dumitriu
wrote:
No, it is a regexp. The result of the MessageFormat is used for
replaceAll, which treats the first argument as a regexp. vmassol (SVN) wrote:
This is not a regex but a simple MessageFormat.format(). BTW A Regex
would probably be better since the Pattern could be precompiled (at
the expense of more complex code though).
Author: vmassol
Date: 2009-06-19 21:18:47 +0200 (Fri, 19 Jun 2009)
New Revision: 21360
Modified:
platform/core/branches/xwiki-core-1.8/xwiki-xml/src/main/java/org/
xwiki/xml/XMLUtils.java
platform/core/branches/xwiki-core-1.8/xwiki-xml/src/test/java/org/
xwiki/xml/internal/html/DefaultHTMLCleanerTest.java
Log:
XWIKI-4005: HMTL Cleaner should not expand empty elements for BR
and HR in order to support IE6
Modified: platform/core/branches/xwiki-core-1.8/xwiki-xml/src/main/
java/org/xwiki/xml/XMLUtils.java
===================================================================
--- platform/core/branches/xwiki-core-1.8/xwiki-xml/src/main/java/
org/xwiki/xml/XMLUtils.java 2009-06-19 16:35:08 UTC (rev 21359)
+++ platform/core/branches/xwiki-core-1.8/xwiki-xml/src/main/java/
org/xwiki/xml/XMLUtils.java 2009-06-19 19:18:47 UTC (rev 21360)
@@ -213,7 +225,16 @@
format.setOmitDeclaration(omitDeclaration);
XMLOutputter outputter = new XWikiXMLOutputter(format,
omitDoctype);
- return outputter.outputString(jdomDoc);
+ String result = outputter.outputString(jdomDoc);
+
+ // Since we need to support IE6 we must generate compact
form for the following HTML elements (otherwise they
+ // won't be understood by IE6):
+ for (String specialElement : OMIT_ELEMENT_CLOSE_SET) {
+ result =
result.replaceAll(MessageFormat.format("<{0}></{0}>",
specialElement),
Shouldn't this be something like
"<{0}[^>]*+></{0}>"? I doubt that
there
really is <img></img>, and if it is, it won't make much difference
which
way it's written. >> +
MessageFormat.format("<{0}/>", specialElement));
>> + }
>> +
>> + return result;
--
Sergiu Dumitriu
http://purl.org/net/sergiu/
_______________________________________________
devs mailing list
devs(a)xwiki.org
http://lists.xwiki.org/mailman/listinfo/devs
11:32 a.m.
New subject: [xwiki-devs] [xwiki-notifications] r21360 - in platform/core/branches/xwiki-core-1.8/xwiki-xml/src: main/java/org/xwiki/xml test/java/org/xwiki/xml/internal/html
Vincent Massol wrote:
On Jun 27, 2009, at 10:16 AM, Sergiu Dumitriu wrote:
Hm, it won't work correctly like this, since the new value must take
into account the attributes.
The goal is to replace <img src="/some/image.png"></img> with
<img
src="/some/image.png"/>. You used a long list of elements that should
not use the <x></x> closing tag format, but most of those never appear
without attributes. The regex is not rigorous, meaning that it accepts
non-valid syntax, but since the source comes from our printer, which
*should* in theory generate simple, valid markup, this simpler regex
should be fine.
So, the actual code should be:
result =
result.replaceAll(MessageFormat.format("<{0}([^>]*+)></{0}>",
specialElement), MessageFormat.format("<{0}$1/>", specialElement));
--
Sergiu Dumitriu
http://purl.org/net/sergiu/
Vincent Massol wrote:
ah right :)
Now I don't understand your regex does.
I understand it would replace for ex "<imghello whatever></img>".
Why
would we want this?
It's very likely I don't understand the regex you pasted since it
doesnt make sense to me. On Jun 26, 2009, at 8:37 PM, Sergiu Dumitriu
wrote:
No, it is a regexp. The result of the MessageFormat is used for
replaceAll, which treats the first argument as a regexp. vmassol (SVN) wrote:
> Author: vmassol
> Date: 2009-06-19 21:18:47 +0200 (Fri, 19 Jun 2009)
> New Revision: 21360
>
> Modified:
> platform/core/branches/xwiki-core-1.8/xwiki-xml/src/main/java/org/
> xwiki/xml/XMLUtils.java
> platform/core/branches/xwiki-core-1.8/xwiki-xml/src/test/java/org/
> xwiki/xml/internal/html/DefaultHTMLCleanerTest.java
> Log:
> XWIKI-4005: HMTL Cleaner should not expand empty elements for BR
> and HR in order to support IE6
>
>
> Modified: platform/core/branches/xwiki-core-1.8/xwiki-xml/src/main/
> java/org/xwiki/xml/XMLUtils.java
> ===================================================================
> --- platform/core/branches/xwiki-core-1.8/xwiki-xml/src/main/java/
> org/xwiki/xml/XMLUtils.java 2009-06-19 16:35:08 UTC (rev 21359)
> +++ platform/core/branches/xwiki-core-1.8/xwiki-xml/src/main/java/
> org/xwiki/xml/XMLUtils.java 2009-06-19 19:18:47 UTC (rev 21360)
> @@ -213,7 +225,16 @@
> format.setOmitDeclaration(omitDeclaration);
>
> XMLOutputter outputter = new XWikiXMLOutputter(format,
> omitDoctype);
> - return outputter.outputString(jdomDoc);
> + String result = outputter.outputString(jdomDoc);
> +
> + // Since we need to support IE6 we must generate compact
> form for the following HTML elements (otherwise they
> + // won't be understood by IE6):
> + for (String specialElement : OMIT_ELEMENT_CLOSE_SET) {
> + result =
> result.replaceAll(MessageFormat.format("<{0}></{0}>",
> specialElement),
Shouldn't this be something like "<{0}[^>]*+></{0}>"? I
doubt that
there
really is <img></img>, and if it is, it won't make much difference
which
way it's written.
This is not a regex but a simple MessageFormat.format(). BTW
A Regex
would probably be better since the Pattern could be precompiled (at
the expense of more complex code though).
5613
days inactive
5614
days old
4 comments
2 participants
participants (2)
-
Sergiu Dumitriu -
Vincent Massol