You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by jo...@apache.org on 2009/12/03 20:50:22 UTC
svn commit: r886897 - in /incubator/shindig/trunk/java/gadgets/src:
main/java/org/apache/shindig/gadgets/parse/nekohtml/
test/java/org/apache/shindig/gadgets/parse/
test/resources/org/apache/shindig/gadgets/parse/nekohtml/
Author: johnh
Date: Thu Dec 3 19:50:22 2009
New Revision: 886897
URL: http://svn.apache.org/viewvc?rev=886897&view=rev
Log:
Don't invert the order of script blocks added to body.
Modified:
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java
incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript-expected.html
incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript.html
Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java?rev=886897&r1=886896&r2=886897&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java Thu Dec 3 19:50:22 2009
@@ -210,6 +210,7 @@
Node headScript = headScripts.pop();
head.removeChild(headScript);
body.insertBefore(headScript, bodyFirst);
+ bodyFirst = headScript;
}
}
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java?rev=886897&r1=886896&r2=886897&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java Thu Dec 3 19:50:22 2009
@@ -44,6 +44,6 @@
throws Exception {
Document document = parser.parseDom(content);
expected = StringUtils.replace(expected, EOL, "\n");
- assertEquals(expected, HtmlSerialization.serialize(document));
+ assertEquals(expected.trim(), HtmlSerialization.serialize(document).trim());
}
}
Modified: incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript-expected.html
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript-expected.html?rev=886897&r1=886896&r2=886897&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript-expected.html (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript-expected.html Thu Dec 3 19:50:22 2009
@@ -3,4 +3,5 @@
<link rel="linkrel">
-</head><body><script>foo3();</script><script>foo2();</script><script>foo1();</script><div id="mydiv">mycontent</div></body></html>
\ No newline at end of file
+</head><body><script>foo1();</script><script>foo2();</script><script>foo3();</script><div id="mydiv">mycontent</div>
+</body></html>
Modified: incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript.html
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript.html?rev=886897&r1=886896&r2=886897&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript.html (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript.html Thu Dec 3 19:50:22 2009
@@ -3,4 +3,4 @@
<script>foo2();</script>
<link rel="linkrel"/>
<script>foo3();</script>
-<div id="mydiv">mycontent</div>
\ No newline at end of file
+<div id="mydiv">mycontent</div>
Re: svn commit: r886897 - in /incubator/shindig/trunk/java/gadgets/src:
main/java/org/apache/shindig/gadgets/parse/nekohtml/ test/java/org/apache/shindig/gadgets/parse/
test/resources/org/apache/shindig/gadgets/parse/nekohtml/
Posted by John Hjelmstad <fa...@google.com>.
Good find, thanks -- updated w/ comment and put a watch on it.
On Thu, Dec 3, 2009 at 4:35 PM, Paul Lindner <li...@inuus.com> wrote:
> https://issues.apache.org/jira/browse/SHINDIG-1234 ?
>
>
> On Thu, Dec 3, 2009 at 12:12 PM, John Hjelmstad <fa...@google.com> wrote:
>
> > Possible, though on a search I don't see any obvious candidates offhand?
> >
> > On Thu, Dec 3, 2009 at 12:09 PM, Paul Lindner <li...@inuus.com> wrote:
> >
> > > Isn't this related to a JIRA issue recently filed?
> > >
> > >
> > > On Thu, Dec 3, 2009 at 11:50 AM, <jo...@apache.org> wrote:
> > >
> > > > Author: johnh
> > > > Date: Thu Dec 3 19:50:22 2009
> > > > New Revision: 886897
> > > >
> > > > URL: http://svn.apache.org/viewvc?rev=886897&view=rev
> > > > Log:
> > > > Don't invert the order of script blocks added to body.
> > > >
> > > >
> > > > Modified:
> > > >
> > > >
> > >
> >
> incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
> > > >
> > > >
> > >
> >
> incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java
> > > >
> > > >
> > >
> >
> incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript-expected.html
> > > >
> > > >
> > >
> >
> incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript.html
> > > >
> > > > Modified:
> > > >
> > >
> >
> incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
> > > > URL:
> > > >
> > >
> >
> http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java?rev=886897&r1=886896&r2=886897&view=diff
> > > >
> > > >
> > >
> >
> ==============================================================================
> > > > ---
> > > >
> > >
> >
> incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
> > > > (original)
> > > > +++
> > > >
> > >
> >
> incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
> > > > Thu Dec 3 19:50:22 2009
> > > > @@ -210,6 +210,7 @@
> > > > Node headScript = headScripts.pop();
> > > > head.removeChild(headScript);
> > > > body.insertBefore(headScript, bodyFirst);
> > > > + bodyFirst = headScript;
> > > > }
> > > > }
> > > >
> > > >
> > > > Modified:
> > > >
> > >
> >
> incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java
> > > > URL:
> > > >
> > >
> >
> http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java?rev=886897&r1=886896&r2=886897&view=diff
> > > >
> > > >
> > >
> >
> ==============================================================================
> > > > ---
> > > >
> > >
> >
> incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java
> > > > (original)
> > > > +++
> > > >
> > >
> >
> incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java
> > > > Thu Dec 3 19:50:22 2009
> > > > @@ -44,6 +44,6 @@
> > > > throws Exception {
> > > > Document document = parser.parseDom(content);
> > > > expected = StringUtils.replace(expected, EOL, "\n");
> > > > - assertEquals(expected, HtmlSerialization.serialize(document));
> > > > + assertEquals(expected.trim(),
> > > > HtmlSerialization.serialize(document).trim());
> > > > }
> > > > }
> > > >
> > > > Modified:
> > > >
> > >
> >
> incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript-expected.html
> > > > URL:
> > > >
> > >
> >
> http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript-expected.html?rev=886897&r1=886896&r2=886897&view=diff
> > > >
> > > >
> > >
> >
> ==============================================================================
> > > > ---
> > > >
> > >
> >
> incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript-expected.html
> > > > (original)
> > > > +++
> > > >
> > >
> >
> incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript-expected.html
> > > > Thu Dec 3 19:50:22 2009
> > > > @@ -3,4 +3,5 @@
> > > >
> > > > <link rel="linkrel">
> > > >
> > > >
> > >
> >
> -</head><body><script>foo3();</script><script>foo2();</script><script>foo1();</script><div
> > > > id="mydiv">mycontent</div></body></html>
> > > > \ No newline at end of file
> > > >
> > >
> >
> +</head><body><script>foo1();</script><script>foo2();</script><script>foo3();</script><div
> > > > id="mydiv">mycontent</div>
> > > > +</body></html>
> > > >
> > > > Modified:
> > > >
> > >
> >
> incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript.html
> > > > URL:
> > > >
> > >
> >
> http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript.html?rev=886897&r1=886896&r2=886897&view=diff
> > > >
> > > >
> > >
> >
> ==============================================================================
> > > > ---
> > > >
> > >
> >
> incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript.html
> > > > (original)
> > > > +++
> > > >
> > >
> >
> incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript.html
> > > > Thu Dec 3 19:50:22 2009
> > > > @@ -3,4 +3,4 @@
> > > > <script>foo2();</script>
> > > > <link rel="linkrel"/>
> > > > <script>foo3();</script>
> > > > -<div id="mydiv">mycontent</div>
> > > > \ No newline at end of file
> > > > +<div id="mydiv">mycontent</div>
> > > >
> > > >
> > > >
> > >
> >
>
Re: svn commit: r886897 - in /incubator/shindig/trunk/java/gadgets/src:
main/java/org/apache/shindig/gadgets/parse/nekohtml/ test/java/org/apache/shindig/gadgets/parse/
test/resources/org/apache/shindig/gadgets/parse/nekohtml/
Posted by Paul Lindner <li...@inuus.com>.
https://issues.apache.org/jira/browse/SHINDIG-1234 ?
On Thu, Dec 3, 2009 at 12:12 PM, John Hjelmstad <fa...@google.com> wrote:
> Possible, though on a search I don't see any obvious candidates offhand?
>
> On Thu, Dec 3, 2009 at 12:09 PM, Paul Lindner <li...@inuus.com> wrote:
>
> > Isn't this related to a JIRA issue recently filed?
> >
> >
> > On Thu, Dec 3, 2009 at 11:50 AM, <jo...@apache.org> wrote:
> >
> > > Author: johnh
> > > Date: Thu Dec 3 19:50:22 2009
> > > New Revision: 886897
> > >
> > > URL: http://svn.apache.org/viewvc?rev=886897&view=rev
> > > Log:
> > > Don't invert the order of script blocks added to body.
> > >
> > >
> > > Modified:
> > >
> > >
> >
> incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
> > >
> > >
> >
> incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java
> > >
> > >
> >
> incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript-expected.html
> > >
> > >
> >
> incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript.html
> > >
> > > Modified:
> > >
> >
> incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
> > > URL:
> > >
> >
> http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java?rev=886897&r1=886896&r2=886897&view=diff
> > >
> > >
> >
> ==============================================================================
> > > ---
> > >
> >
> incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
> > > (original)
> > > +++
> > >
> >
> incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
> > > Thu Dec 3 19:50:22 2009
> > > @@ -210,6 +210,7 @@
> > > Node headScript = headScripts.pop();
> > > head.removeChild(headScript);
> > > body.insertBefore(headScript, bodyFirst);
> > > + bodyFirst = headScript;
> > > }
> > > }
> > >
> > >
> > > Modified:
> > >
> >
> incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java
> > > URL:
> > >
> >
> http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java?rev=886897&r1=886896&r2=886897&view=diff
> > >
> > >
> >
> ==============================================================================
> > > ---
> > >
> >
> incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java
> > > (original)
> > > +++
> > >
> >
> incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java
> > > Thu Dec 3 19:50:22 2009
> > > @@ -44,6 +44,6 @@
> > > throws Exception {
> > > Document document = parser.parseDom(content);
> > > expected = StringUtils.replace(expected, EOL, "\n");
> > > - assertEquals(expected, HtmlSerialization.serialize(document));
> > > + assertEquals(expected.trim(),
> > > HtmlSerialization.serialize(document).trim());
> > > }
> > > }
> > >
> > > Modified:
> > >
> >
> incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript-expected.html
> > > URL:
> > >
> >
> http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript-expected.html?rev=886897&r1=886896&r2=886897&view=diff
> > >
> > >
> >
> ==============================================================================
> > > ---
> > >
> >
> incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript-expected.html
> > > (original)
> > > +++
> > >
> >
> incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript-expected.html
> > > Thu Dec 3 19:50:22 2009
> > > @@ -3,4 +3,5 @@
> > >
> > > <link rel="linkrel">
> > >
> > >
> >
> -</head><body><script>foo3();</script><script>foo2();</script><script>foo1();</script><div
> > > id="mydiv">mycontent</div></body></html>
> > > \ No newline at end of file
> > >
> >
> +</head><body><script>foo1();</script><script>foo2();</script><script>foo3();</script><div
> > > id="mydiv">mycontent</div>
> > > +</body></html>
> > >
> > > Modified:
> > >
> >
> incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript.html
> > > URL:
> > >
> >
> http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript.html?rev=886897&r1=886896&r2=886897&view=diff
> > >
> > >
> >
> ==============================================================================
> > > ---
> > >
> >
> incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript.html
> > > (original)
> > > +++
> > >
> >
> incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript.html
> > > Thu Dec 3 19:50:22 2009
> > > @@ -3,4 +3,4 @@
> > > <script>foo2();</script>
> > > <link rel="linkrel"/>
> > > <script>foo3();</script>
> > > -<div id="mydiv">mycontent</div>
> > > \ No newline at end of file
> > > +<div id="mydiv">mycontent</div>
> > >
> > >
> > >
> >
>
Re: svn commit: r886897 - in /incubator/shindig/trunk/java/gadgets/src:
main/java/org/apache/shindig/gadgets/parse/nekohtml/ test/java/org/apache/shindig/gadgets/parse/
test/resources/org/apache/shindig/gadgets/parse/nekohtml/
Posted by John Hjelmstad <fa...@google.com>.
Possible, though on a search I don't see any obvious candidates offhand?
On Thu, Dec 3, 2009 at 12:09 PM, Paul Lindner <li...@inuus.com> wrote:
> Isn't this related to a JIRA issue recently filed?
>
>
> On Thu, Dec 3, 2009 at 11:50 AM, <jo...@apache.org> wrote:
>
> > Author: johnh
> > Date: Thu Dec 3 19:50:22 2009
> > New Revision: 886897
> >
> > URL: http://svn.apache.org/viewvc?rev=886897&view=rev
> > Log:
> > Don't invert the order of script blocks added to body.
> >
> >
> > Modified:
> >
> >
> incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
> >
> >
> incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java
> >
> >
> incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript-expected.html
> >
> >
> incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript.html
> >
> > Modified:
> >
> incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
> > URL:
> >
> http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java?rev=886897&r1=886896&r2=886897&view=diff
> >
> >
> ==============================================================================
> > ---
> >
> incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
> > (original)
> > +++
> >
> incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
> > Thu Dec 3 19:50:22 2009
> > @@ -210,6 +210,7 @@
> > Node headScript = headScripts.pop();
> > head.removeChild(headScript);
> > body.insertBefore(headScript, bodyFirst);
> > + bodyFirst = headScript;
> > }
> > }
> >
> >
> > Modified:
> >
> incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java
> > URL:
> >
> http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java?rev=886897&r1=886896&r2=886897&view=diff
> >
> >
> ==============================================================================
> > ---
> >
> incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java
> > (original)
> > +++
> >
> incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java
> > Thu Dec 3 19:50:22 2009
> > @@ -44,6 +44,6 @@
> > throws Exception {
> > Document document = parser.parseDom(content);
> > expected = StringUtils.replace(expected, EOL, "\n");
> > - assertEquals(expected, HtmlSerialization.serialize(document));
> > + assertEquals(expected.trim(),
> > HtmlSerialization.serialize(document).trim());
> > }
> > }
> >
> > Modified:
> >
> incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript-expected.html
> > URL:
> >
> http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript-expected.html?rev=886897&r1=886896&r2=886897&view=diff
> >
> >
> ==============================================================================
> > ---
> >
> incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript-expected.html
> > (original)
> > +++
> >
> incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript-expected.html
> > Thu Dec 3 19:50:22 2009
> > @@ -3,4 +3,5 @@
> >
> > <link rel="linkrel">
> >
> >
> -</head><body><script>foo3();</script><script>foo2();</script><script>foo1();</script><div
> > id="mydiv">mycontent</div></body></html>
> > \ No newline at end of file
> >
> +</head><body><script>foo1();</script><script>foo2();</script><script>foo3();</script><div
> > id="mydiv">mycontent</div>
> > +</body></html>
> >
> > Modified:
> >
> incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript.html
> > URL:
> >
> http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript.html?rev=886897&r1=886896&r2=886897&view=diff
> >
> >
> ==============================================================================
> > ---
> >
> incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript.html
> > (original)
> > +++
> >
> incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript.html
> > Thu Dec 3 19:50:22 2009
> > @@ -3,4 +3,4 @@
> > <script>foo2();</script>
> > <link rel="linkrel"/>
> > <script>foo3();</script>
> > -<div id="mydiv">mycontent</div>
> > \ No newline at end of file
> > +<div id="mydiv">mycontent</div>
> >
> >
> >
>
Re: svn commit: r886897 - in /incubator/shindig/trunk/java/gadgets/src:
main/java/org/apache/shindig/gadgets/parse/nekohtml/ test/java/org/apache/shindig/gadgets/parse/
test/resources/org/apache/shindig/gadgets/parse/nekohtml/
Posted by Paul Lindner <li...@inuus.com>.
Isn't this related to a JIRA issue recently filed?
On Thu, Dec 3, 2009 at 11:50 AM, <jo...@apache.org> wrote:
> Author: johnh
> Date: Thu Dec 3 19:50:22 2009
> New Revision: 886897
>
> URL: http://svn.apache.org/viewvc?rev=886897&view=rev
> Log:
> Don't invert the order of script blocks added to body.
>
>
> Modified:
>
> incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
>
> incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java
>
> incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript-expected.html
>
> incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript.html
>
> Modified:
> incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
> URL:
> http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java?rev=886897&r1=886896&r2=886897&view=diff
>
> ==============================================================================
> ---
> incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
> (original)
> +++
> incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/nekohtml/NekoSimplifiedHtmlParser.java
> Thu Dec 3 19:50:22 2009
> @@ -210,6 +210,7 @@
> Node headScript = headScripts.pop();
> head.removeChild(headScript);
> body.insertBefore(headScript, bodyFirst);
> + bodyFirst = headScript;
> }
> }
>
>
> Modified:
> incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java
> URL:
> http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java?rev=886897&r1=886896&r2=886897&view=diff
>
> ==============================================================================
> ---
> incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java
> (original)
> +++
> incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/parse/AbstractParserAndSerializerTest.java
> Thu Dec 3 19:50:22 2009
> @@ -44,6 +44,6 @@
> throws Exception {
> Document document = parser.parseDom(content);
> expected = StringUtils.replace(expected, EOL, "\n");
> - assertEquals(expected, HtmlSerialization.serialize(document));
> + assertEquals(expected.trim(),
> HtmlSerialization.serialize(document).trim());
> }
> }
>
> Modified:
> incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript-expected.html
> URL:
> http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript-expected.html?rev=886897&r1=886896&r2=886897&view=diff
>
> ==============================================================================
> ---
> incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript-expected.html
> (original)
> +++
> incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript-expected.html
> Thu Dec 3 19:50:22 2009
> @@ -3,4 +3,5 @@
>
> <link rel="linkrel">
>
> -</head><body><script>foo3();</script><script>foo2();</script><script>foo1();</script><div
> id="mydiv">mycontent</div></body></html>
> \ No newline at end of file
> +</head><body><script>foo1();</script><script>foo2();</script><script>foo3();</script><div
> id="mydiv">mycontent</div>
> +</body></html>
>
> Modified:
> incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript.html
> URL:
> http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript.html?rev=886897&r1=886896&r2=886897&view=diff
>
> ==============================================================================
> ---
> incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript.html
> (original)
> +++
> incubator/shindig/trunk/java/gadgets/src/test/resources/org/apache/shindig/gadgets/parse/nekohtml/test-leadingscript.html
> Thu Dec 3 19:50:22 2009
> @@ -3,4 +3,4 @@
> <script>foo2();</script>
> <link rel="linkrel"/>
> <script>foo3();</script>
> -<div id="mydiv">mycontent</div>
> \ No newline at end of file
> +<div id="mydiv">mycontent</div>
>
>
>