Skip to content

Commit

Permalink
Fix #648 - fixing issue where meta tags having a property attribute w…
Browse files Browse the repository at this point in the history
…as intermediately ordered so a final "grab deepest id dubplicate" would grab the exact opposite of what it should.
  • Loading branch information
mawtex committed Jan 25, 2019
1 parent 1c27f5a commit 7585826
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions Composite/Core/WebClient/Renderings/Page/PageRenderer.cs
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -642,11 +642,8 @@ public static void NormalizeXhtmlDocument(XhtmlDocument rootDocument)


rootDocument.Root.Add(nestedDocument.Attributes().Except(rootDocument.Root.Attributes(), _nameBasedAttributeComparer)); rootDocument.Root.Add(nestedDocument.Attributes().Except(rootDocument.Root.Attributes(), _nameBasedAttributeComparer));


// making <meta property="..." /> from nested documents appear first. We will not filter them later and this ensure desired precedence rootDocument.Head.Add(nestedHead.Nodes());
bool IsMetaProperty(XElement e) => e.Name.LocalName == "meta" && e.Attribute("property") != null;


rootDocument.Head.AddFirst(nestedHead.Elements().Where(IsMetaProperty));
rootDocument.Head.Add(nestedHead.Nodes().Where(f => !(f is XElement e && IsMetaProperty(e))));
rootDocument.Head.Add(nestedHead.Attributes().Except(rootDocument.Head.Attributes(), _nameBasedAttributeComparer)); rootDocument.Head.Add(nestedHead.Attributes().Except(rootDocument.Head.Attributes(), _nameBasedAttributeComparer));
rootDocument.Body.Add(nestedBody.Attributes().Except(rootDocument.Body.Attributes(), _nameBasedAttributeComparer)); rootDocument.Body.Add(nestedBody.Attributes().Except(rootDocument.Body.Attributes(), _nameBasedAttributeComparer));


Expand Down

0 comments on commit 7585826

Please sign in to comment.