diff --git a/Wino.Mail/Dialogs/SignatureEditorDialog.xaml.cs b/Wino.Mail/Dialogs/SignatureEditorDialog.xaml.cs
index 1d9cc7c2..d544bde7 100644
--- a/Wino.Mail/Dialogs/SignatureEditorDialog.xaml.cs
+++ b/Wino.Mail/Dialogs/SignatureEditorDialog.xaml.cs
@@ -245,6 +245,12 @@ namespace Wino.Dialogs
return string.Empty;
}
+ private async void WebViewToggleButtonClicked(object sender, RoutedEventArgs e)
+ {
+ var enable = WebviewToolBarButton.IsChecked == true ? "true" : "false";
+ await InvokeScriptSafeAsync($"toggleToolbar('{enable}');");
+ }
+
private async Task UpdateEditorThemeAsync()
{
await _domLoadedTask.Task;
@@ -358,11 +364,5 @@ namespace Wino.Dialogs
private void SignatureNameTextBoxTextChanged(object sender, TextChangedEventArgs e) => IsPrimaryButtonEnabled = !string.IsNullOrWhiteSpace(SignatureNameTextBox.Text);
private void InvertComposerThemeClicked(object sender, RoutedEventArgs e) => IsComposerDarkMode = !IsComposerDarkMode;
-
- private async void WebViewToggleButtonClicked(object sender, RoutedEventArgs e)
- {
- var enable = WebviewToolBarButton.IsChecked == true ? "true" : "false";
- await InvokeScriptSafeAsync($"toggleToolbar('{enable}');");
- }
}
}
diff --git a/Wino.Mail/JS/editor.js b/Wino.Mail/JS/editor.js
index 0e39a018..a1cc0cba 100644
--- a/Wino.Mail/JS/editor.js
+++ b/Wino.Mail/JS/editor.js
@@ -1,7 +1,7 @@
const editor = Jodit.make("#editor", {
"useSearch": false,
"toolbar": true,
- "buttons": "bold,italic,underline,strikethrough,brush,ul,ol,font,fontsize,paragraph,image,link,indent,outdent,left",
+ "buttons": "bold,italic,underline,strikethrough,brush,ul,ol,font,fontsize,paragraph,image,link,indent,outdent,align",
"inline": true,
"toolbarAdaptive": false,
"toolbarInlineForSelection": false,
diff --git a/Wino.Mail/Views/ComposePage.xaml b/Wino.Mail/Views/ComposePage.xaml
index 37b43af5..2a8057eb 100644
--- a/Wino.Mail/Views/ComposePage.xaml
+++ b/Wino.Mail/Views/ComposePage.xaml
@@ -186,270 +186,220 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
+
+
+
+
+
+
-
+
-
-
-
-
+
+
+
+
+
+
-
+
-
-
-
-
+
+
+
+
+
+
-
+
-
-
+
+
+
+
+
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
+
+
+
+
+
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
ExecuteScriptFunctionAsync(string functionName, params object[] parameters)
{
string script = functionName + "(";
@@ -289,11 +295,6 @@ namespace Wino.Views
return string.Empty;
}
- private async void LinkButtonClicked(object sender, RoutedEventArgs e)
- {
- HyperlinkTextBox.Text = await TryGetSelectedTextAsync();
- }
-
public async Task UpdateEditorThemeAsync()
{
await DOMLoadedTask.Task;
@@ -467,14 +468,6 @@ namespace Wino.Views
await RenderInternalAsync(message.RenderModel.RenderHtml);
}
- private async void HyperlinkAddClicked(object sender, RoutedEventArgs e)
- {
- await InvokeScriptSafeAsync($"addHyperlink('{LinkUrlTextBox.Text}')");
-
- LinkUrlTextBox.Text = string.Empty;
- HyperlinkFlyout.Hide();
- }
-
private void BarDynamicOverflowChanging(CommandBar sender, DynamicOverflowItemsChangingEventArgs args)
{
if (args.Action == CommandBarDynamicOverflowAction.AddingToOverflow)