JavaScript was disabled (#271)

* JavaScript was disabled * function was renamed
Eppie-io · Jun 25, 2024 · e0d2ce3 · e0d2ce3
1 parent 197836f
commit e0d2ce3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/src/Eppie.App/Eppie.App.Shared/Extensions/WebViewExtension.cs b/src/Eppie.App/Eppie.App.Shared/Extensions/WebViewExtension.cs
@@ -5,22 +5,24 @@ namespace Tuvi.App.Shared.Extensions
 {
 	public static class WebViewExtension
 	{
-        public static string GetStringSource(DependencyObject obj)
+        public static string GetStringSourceWithDisabledJavaScript(DependencyObject obj)
         {
-            return (string)obj?.GetValue(StringSourceProperty);
+            return (string)obj?.GetValue(StringSourceWithDisabledJavaScriptProperty);
         }
 
-        public static void SetStringSource(DependencyObject obj, string value)
+        public static void SetStringSourceWithDisabledJavaScript(DependencyObject obj, string value)
         {
-            obj?.SetValue(StringSourceProperty, value);
+            obj?.SetValue(StringSourceWithDisabledJavaScriptProperty, value);
         }
 
-        public static readonly DependencyProperty StringSourceProperty =
-            DependencyProperty.RegisterAttached("StringSource", typeof(string), typeof(WebViewExtension), new PropertyMetadata("", OnStringSourcePropertyChanged));
-        private static void OnStringSourcePropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        public static readonly DependencyProperty StringSourceWithDisabledJavaScriptProperty =
+            DependencyProperty.RegisterAttached("StringSourceWithDisabledJavaScript", typeof(string), typeof(WebViewExtension), new PropertyMetadata("", OnStringSourceWithDisabledJavaScriptPropertyChanged));
+        private static void OnStringSourceWithDisabledJavaScriptPropertyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             if (d is WebView webView)
             {
+                webView.Settings.IsJavaScriptEnabled = false;
+
                 webView.NavigateToString(e.NewValue as string ?? "");
             }
         }

diff --git a/src/Eppie.App/Eppie.App.Shared/Views/MessagePage.xaml b/src/Eppie.App/Eppie.App.Shared/Views/MessagePage.xaml
@@ -233,7 +233,7 @@
               BorderBrush="#FFE0E0E0"
               BorderThickness="1">
 
-            <WebView extensions:WebViewExtension.StringSource="{x:Bind ViewModel.MessageInfo.MessageHtmlBody, Mode=OneWay}"
+            <WebView extensions:WebViewExtension.StringSourceWithDisabledJavaScript="{x:Bind ViewModel.MessageInfo.MessageHtmlBody, Mode=OneWay}"
                      Visibility="{x:Bind ViewModel.MessageInfo.HasHtmlBody, Mode=OneWay}" />
 
             <ScrollViewer Padding="4"