Skip to content
This repository was archived by the owner on Apr 29, 2024. It is now read-only.

Commit df9fa8f

Browse files
committed
Updates for 4.7.
1 parent a1f902a commit df9fa8f

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

DataBindingDemos/DataBindingDemos/DataBindingDemos/Converters/StringConcatenationConverter.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public object Convert(object[] values, Type targetType, object parameter, Cultur
3434
{
3535
return BindableProperty.UnsetValue;
3636
}
37-
if (value as string == "null")
37+
if (value as string == null)
3838
{
3939
return null;
4040
}
@@ -68,7 +68,7 @@ public object[] ConvertBack(object value, Type[] targetTypes, object parameter,
6868
for (int i = 0; i < array.Length; i++)
6969
{
7070
var str = array[i] as string;
71-
if (str == "null")
71+
if (str == null)
7272
{
7373
array[i] = null;
7474
}

DataBindingDemos/DataBindingDemos/DataBindingDemos/Views/MultiBindingFallbackValuePage.xaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
<Label>
1919
<Label.Text>
2020
<MultiBinding FallbackValue="Name unavailable"
21+
TargetNullValue="Data unavailable"
2122
Converter="{StaticResource StringConcatConverter}">
2223
<Binding Path="Employee1.Forename" />
2324
<Binding Path="Employee1.MiddleName" />
@@ -30,6 +31,7 @@
3031
<!-- This MultiBinding should return its FallbackValue,
3132
because the converter returns BindableProperty.UnsetValue -->
3233
<MultiBinding FallbackValue="Name unavailable"
34+
TargetNullValue="Data unavailable"
3335
Converter="{StaticResource StringConcatConverter}">
3436
<Binding Path="Employee.Forename" />
3537
<Binding Path="Employee.MiddleName" />
@@ -40,6 +42,7 @@
4042
<Label>
4143
<Label.Text>
4244
<MultiBinding FallbackValue="Name unavailable"
45+
TargetNullValue="Data unavailable"
4346
Converter="{StaticResource StringConcatConverter}">
4447
<Binding Path="Employee3.Forename" />
4548
<Binding Path="Employee3.MiddleName" />
@@ -50,6 +53,7 @@
5053
<Label>
5154
<Label.Text>
5255
<MultiBinding FallbackValue="Name unavailable"
56+
TargetNullValue="Data unavailable"
5357
Converter="{StaticResource StringConcatConverter}">
5458
<Binding Path="Employee4.Forename" />
5559
<Binding Path="Employee4.MiddleName" />
@@ -60,6 +64,7 @@
6064
<Label>
6165
<Label.Text>
6266
<MultiBinding FallbackValue="Name unavailable"
67+
TargetNullValue="Data unavailable"
6368
Converter="{StaticResource StringConcatConverter}">
6469
<Binding Path="Employee5.Forename" />
6570
<Binding Path="Employee5.MiddleName" />
@@ -72,6 +77,7 @@
7277
<!-- This MultiBinding should return its FallbackValue,
7378
because the converter returns BindableProperty.UnsetValue -->
7479
<MultiBinding FallbackValue="Name unavailable"
80+
TargetNullValue="Data unavailable"
7581
Converter="{StaticResource StringConcatConverter}">
7682
<Binding Path="Employee6.Forename" />
7783
<Binding Path="Employee6.MiddleName" />

0 commit comments

Comments
 (0)