Skip to content

Commit 23c8b1f

Browse files
author
Manisha Jha
committed
fix: resolving conflicts
1 parent c34be8c commit 23c8b1f

File tree

1 file changed

+28
-23
lines changed

1 file changed

+28
-23
lines changed

src/Files.App/Views/ReleaseNotesPage.xaml.cs

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -83,29 +83,34 @@ protected override void OnNavigatedFrom(NavigationEventArgs e)
8383

8484
private async void BlogPostWebView_CoreWebView2Initialized(WebView2 sender, CoreWebView2InitializedEventArgs args)
8585
{
86-
87-
88-
sender.CoreWebView2.Profile.PreferredColorScheme = (CoreWebView2PreferredColorScheme)RootAppElement.RequestedTheme;
89-
sender.CoreWebView2.Settings.AreDefaultContextMenusEnabled = false;
90-
sender.CoreWebView2.Settings.AreDevToolsEnabled = false;
91-
sender.CoreWebView2.Settings.AreBrowserAcceleratorKeysEnabled = false;
92-
sender.CoreWebView2.Settings.IsSwipeNavigationEnabled = false;
93-
94-
var script = @"
95-
document.addEventListener('click', function(event) {
96-
var target = event.target;
97-
while (target && target.tagName !== 'A') {
98-
target = target.parentElement;
99-
}
100-
if (target && target.href) {
101-
event.preventDefault();
102-
window.chrome.webview.postMessage(target.href);
103-
}
104-
});
105-
";
106-
107-
await sender.CoreWebView2.AddScriptToExecuteOnDocumentCreatedAsync(script);
108-
sender.WebMessageReceived += WebView_WebMessageReceived;
86+
try
87+
{
88+
sender.CoreWebView2.Profile.PreferredColorScheme = (CoreWebView2PreferredColorScheme)RootAppElement.RequestedTheme;
89+
sender.CoreWebView2.Settings.AreDefaultContextMenusEnabled = false;
90+
sender.CoreWebView2.Settings.AreDevToolsEnabled = false;
91+
sender.CoreWebView2.Settings.AreBrowserAcceleratorKeysEnabled = false;
92+
sender.CoreWebView2.Settings.IsSwipeNavigationEnabled = false;
93+
94+
var script = @"
95+
document.addEventListener('click', function(event) {
96+
var target = event.target;
97+
while (target && target.tagName !== 'A') {
98+
target = target.parentElement;
99+
}
100+
if (target && target.href) {
101+
event.preventDefault();
102+
window.chrome.webview.postMessage(target.href);
103+
}
104+
});
105+
";
106+
107+
await sender.CoreWebView2.AddScriptToExecuteOnDocumentCreatedAsync(script);
108+
sender.WebMessageReceived += WebView_WebMessageReceived;
109+
}
110+
catch (Exception ex)
111+
{
112+
App.Logger.LogWarning(ex, ex.Message);
113+
}
109114
}
110115

111116
private async void WebView_WebMessageReceived(WebView2 sender, CoreWebView2WebMessageReceivedEventArgs args)

0 commit comments

Comments
 (0)