Author: alexsmirnov Date: 2007-11-21 18:30:09 -0500 (Wed, 21 Nov 2007) New Revision: 4162 Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/nekko/NekkoParser.java Log: Fix <title>/<script>/<link> tags order Modified: trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/nekko/NekkoParser.java =================================================================== --- trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/nekko/NekkoParser.java 2007-11-21 23:19:28 UTC (rev 4161) +++ trunk/framework/impl/src/main/java/org/ajax4jsf/webapp/nekko/NekkoParser.java 2007-11-21 23:30:09 UTC (rev 4162) @@ -362,8 +362,14 @@ } else if ("head".equalsIgnoreCase(element.rawname)) { haveHead = true; super.startElement(element, attributes, augs); - insertResources(); + // insertResources(); return; + } else if (haveHead) { + // <title> or <base> in the head + if (!("title".equalsIgnoreCase(element.rawname) || "base" + .equalsIgnoreCase(element.rawname))) { + insertResources(); + } } else { if (!haveHtml) { insertStartElement("html"); @@ -464,7 +470,13 @@ } } if (!headParsed) { - if ("head".equalsIgnoreCase(name.rawname)) { + if (haveHead) { + // <title> or <base> in the head + if (!("title".equalsIgnoreCase(name.rawname) || "base" + .equalsIgnoreCase(name.rawname))) { + insertResources(); + } + } else if ("head".equalsIgnoreCase(name.rawname)) { haveHead = true; super.startElement(name, attributes, augmentation); insertResources();