diff options
| author | Stephane Delcroix <stephane@delcroix.org> | 2016-08-15 22:06:11 +0200 |
|---|---|---|
| committer | Jason Smith <jason.smith@xamarin.com> | 2016-08-15 13:06:11 -0700 |
| commit | 775df09a3e45e90128f9047e8618461d4c4411a0 (patch) | |
| tree | 3bfb63278a218c9d1f753f5fdafb7de659a048b5 /Xamarin.Forms.Xaml/CreateValuesVisitor.cs | |
| parent | 0390ea034694d4ad548e9f46cf6f3fa3f291d041 (diff) | |
| download | xamarin-forms-775df09a3e45e90128f9047e8618461d4c4411a0.tar.gz xamarin-forms-775df09a3e45e90128f9047e8618461d4c4411a0.tar.bz2 xamarin-forms-775df09a3e45e90128f9047e8618461d4c4411a0.zip | |
[Xaml] x:Static in x:Arguments (#288)
* [Xaml] Support x:Static as x:Arguments
* [XamlC] allow x:Static in x:Arguments
* fix typo, remove commented code
Diffstat (limited to 'Xamarin.Forms.Xaml/CreateValuesVisitor.cs')
| -rw-r--r-- | Xamarin.Forms.Xaml/CreateValuesVisitor.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Xamarin.Forms.Xaml/CreateValuesVisitor.cs b/Xamarin.Forms.Xaml/CreateValuesVisitor.cs index e52ae594..014d82c2 100644 --- a/Xamarin.Forms.Xaml/CreateValuesVisitor.cs +++ b/Xamarin.Forms.Xaml/CreateValuesVisitor.cs @@ -124,8 +124,8 @@ namespace Xamarin.Forms.Xaml Values[node] = value; - var typeExtension = value as TypeExtension; - if (typeExtension != null) + var markup = value as IMarkupExtension; + if (markup != null && (value is TypeExtension || value is StaticExtension)) { var serviceProvider = new XamlServiceProvider(node, Context); @@ -135,7 +135,7 @@ namespace Xamarin.Forms.Xaml foreach (var cnode in node.CollectionItems) cnode.Accept(visitor, node); - value = typeExtension.ProvideValue(serviceProvider); + value = markup.ProvideValue(serviceProvider); node.Properties.Clear(); node.CollectionItems.Clear(); |