Merge pull request #504 from Microsoft/dev

Fix for #496
microsoft · Jun 22, 2017 · 6d42ea2 · 6d42ea2
2 parents 42c02ca + 00fa7b1
commit 6d42ea2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/templates/Pages/Grid.CodeBehind/Views/GridViewPage.xaml b/templates/Pages/Grid.CodeBehind/Views/GridViewPage.xaml
@@ -24,7 +24,8 @@
         <Grid
             Grid.Row="1" 
             Background="{ThemeResource SystemControlPageBackgroundChromeLowBrush}">
-            <tg:RadDataGrid ColumnDataOperationsMode="Flyout" x:Name="grid" ItemsSource="{x:Bind Source}" />
+            <!-- TODO: Moving from x:Bind to Binding as workarround for https://github.com/Microsoft/WindowsTemplateStudio/issues/496 -->
+            <tg:RadDataGrid ColumnDataOperationsMode="Flyout" x:Name="grid" ItemsSource="{Binding Source}" />
         </Grid>
     </Grid>
 </Page>
diff --git a/templates/Pages/Grid.CodeBehind/Views/GridViewPage.xaml.cs b/templates/Pages/Grid.CodeBehind/Views/GridViewPage.xaml.cs
@@ -14,6 +14,10 @@ public sealed partial class GridViewPage : Page, System.ComponentModel.INotifyPr
         public GridViewPage()
         {
             InitializeComponent();
+
+            // TODO: Moving from x:Bind to Binding as workaround for https://github.com/Microsoft/WindowsTemplateStudio/issues/496
+            // Once Telerik fix the root cause, we get back to x:Bind and remove the following line
+            DataContext = this;
         }
 
         public ObservableCollection<Order> Source

diff --git a/templates/Pages/Grid/Views/GridViewPage.xaml b/templates/Pages/Grid/Views/GridViewPage.xaml
@@ -24,7 +24,8 @@
         <Grid
             Grid.Row="1" 
             Background="{ThemeResource SystemControlPageBackgroundChromeLowBrush}">
-            <tg:RadDataGrid ColumnDataOperationsMode="Flyout" x:Name="grid" ItemsSource="{x:Bind ViewModel.Source}" />
+            <!-- TODO: Moving from x:Bind to Binding as workaround for https://github.com/Microsoft/WindowsTemplateStudio/issues/496 -->
+            <tg:RadDataGrid ColumnDataOperationsMode="Flyout" x:Name="grid" ItemsSource="{Binding Source}" />
         </Grid>
     </Grid>
 </Page>