diff options
| author | Stephane Delcroix <stephane@delcroix.org> | 2016-08-15 22:07:35 +0200 |
|---|---|---|
| committer | Jason Smith <jason.smith@xamarin.com> | 2016-08-15 13:07:35 -0700 |
| commit | 90396b0ffdecf65b8e2eea8eb4f148bdea1071c4 (patch) | |
| tree | b2a18b90525c693113b796f97c273e25d9980ddb /Xamarin.Forms.Xaml/ApplyPropertiesVisitor.cs | |
| parent | 775df09a3e45e90128f9047e8618461d4c4411a0 (diff) | |
| download | xamarin-forms-90396b0ffdecf65b8e2eea8eb4f148bdea1071c4.tar.gz xamarin-forms-90396b0ffdecf65b8e2eea8eb4f148bdea1071c4.tar.bz2 xamarin-forms-90396b0ffdecf65b8e2eea8eb4f148bdea1071c4.zip | |
Refix mc ignorable (#302)
* Revert "Fix mc ignorable (#298)"
This reverts commit 31c2be29d5982338ae178d1b0f107e23e7749782.
* [Xaml] fix mc:Ignorable
Diffstat (limited to 'Xamarin.Forms.Xaml/ApplyPropertiesVisitor.cs')
| -rw-r--r-- | Xamarin.Forms.Xaml/ApplyPropertiesVisitor.cs | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/Xamarin.Forms.Xaml/ApplyPropertiesVisitor.cs b/Xamarin.Forms.Xaml/ApplyPropertiesVisitor.cs index cdcbe00d..1e332323 100644 --- a/Xamarin.Forms.Xaml/ApplyPropertiesVisitor.cs +++ b/Xamarin.Forms.Xaml/ApplyPropertiesVisitor.cs @@ -9,7 +9,7 @@ using Xamarin.Forms.Xaml.Internals; namespace Xamarin.Forms.Xaml { - class ApplyPropertiesVisitor : IXamlNodeVisitor + internal class ApplyPropertiesVisitor : IXamlNodeVisitor { public static readonly IList<XmlName> Skips = new List<XmlName> { @@ -58,15 +58,9 @@ namespace Xamarin.Forms.Xaml return; if (parentElement.SkipProperties.Contains(propertyName)) return; - if (parentElement.SkipPrefix(node.NamespaceResolver.LookupPrefix(propertyName.NamespaceURI))) - return; if (propertyName.NamespaceURI == "http://schemas.openxmlformats.org/markup-compatibility/2006" && - propertyName.LocalName == "Ignorable") - { - (parentNode.IgnorablePrefixes ?? (parentNode.IgnorablePrefixes = new List<string>())).AddRange( - (value as string).Split(',')); + propertyName.LocalName == "Ignorable") return; - } SetPropertyValue(source, propertyName, value, Context.RootElement, node, Context, node); } else if (IsCollectionItem(node, parentNode) && parentNode is IElementNode) @@ -91,9 +85,6 @@ namespace Xamarin.Forms.Xaml public void Visit(ElementNode node, INode parentNode) { - if (node.SkipPrefix(node.NamespaceResolver.LookupPrefix(node.NamespaceURI))) - return; - var value = Values[node]; var parentElement = parentNode as IElementNode; var markupExtension = value as IMarkupExtension; |