Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Synchronize html editor and md editor with the compose_body textarea and adjust their appearance to match bs styling used #1006

Merged
merged 1 commit into from
May 13, 2024
Merged

Synchronize html editor and md editor with the compose_body textarea and adjust their appearance to match bs styling used #1006

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/smtp/assets/markdown/editor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7224,7 +7224,7 @@ Editor.prototype.render = function(el) {
tabSize: '2',
indentWithTabs: true,
lineNumbers: false,
autofocus: true,
autofocus: false,
extraKeys: keyMaps
});

Expand Down
6 changes: 3 additions & 3 deletions modules/smtp/modules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1085,7 +1085,7 @@ protected function output() {
if ($html == 1) {
$res .= '<script type="text/javascript" src="'.WEB_ROOT.'modules/smtp/assets/kindeditor/kindeditor-all-min.js"></script>'.
'<link href="'.WEB_ROOT.'modules/smtp/assets/kindeditor/themes/default/default.css" rel="stylesheet" />'.
'<script type="text/javascript">KindEditor.ready(function(K) { K.create("#compose_body", {items:'.
'<script type="text/javascript">KindEditor.ready(function(K) { window.kindEditor = K.create("#compose_body", {items:'.
"['formatblock', 'fontname', 'fontsize', 'forecolor', 'hilitecolor', 'bold',".
"'italic', 'underline', 'strikethrough', 'lineheight', 'table', 'hr', 'pagebreak', 'link', 'unlink',".
"'justifyleft', 'justifycenter', 'justifyright',".
Expand Down Expand Up @@ -1131,14 +1131,14 @@ protected function output() {
'</div>'.
'<div class="form-floating mb-3">'.
'<textarea id="compose_body" name="compose_body" class="compose_body form-control" placeholder="'.$this->trans('Message').'">'.$this->html_safe($body).'</textarea>'.
'<label for="compose_body">'.$this->trans('Message').'</label>'.
(!$html ? '<label for="compose_body">'.$this->trans('Message').'</label>': '').
'</div>'.
'<div class="form-check mb-3"><input value="1" name="compose_delivery_receipt" id="compose_delivery_receipt" type="checkbox" class="form-check-input" /><label for="compose_delivery_receipt" class="form-check-label">'.$this->trans('Request a delivery receipt').'</label></div>';
if ($html == 2) {
$res .= '<link href="'.WEB_ROOT.'modules/smtp/assets/markdown/editor.css" rel="stylesheet" />'.
'<script type="text/javascript" src="'.WEB_ROOT.'modules/smtp/assets/markdown/editor.js"></script>'.
'<script type="text/javascript" src="'.WEB_ROOT.'modules/smtp/assets/markdown/marked.js"></script>'.
'<script type="text/javascript">var editor = new Editor(); editor.render();</script>';
'<script type="text/javascript">window.mdEditor = new Editor(); mdEditor.render();</script>';
}
$res .= '<table class="uploaded_files">';

Expand Down
6 changes: 3 additions & 3 deletions modules/smtp/site.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
.smtp_server_setup .content_title { cursor: pointer; }
/* .compose_server, .compose_server option { width: 100%; padding: 5px; margin: 5px; } */
/* .compose_attach_button, .smtp_save, .smtp_reset { cursor: pointer; margin-left: 10px; float: right; margin-top: 10px; } */
.ke-container { margin-left: 5px !important; border-radius: 3px 3px 3px; margin-top: 5px !important; margin-bottom: 5px !important; padding-right: 0px !important; width: 100% !important; }
.ke-container { border-radius: var(--bs-border-radius); margin-top: 5px !important; margin-bottom: 5px !important; padding-right: 0px !important; width: 100% !important; }
.recipient_fields { display: none; }
.compose_attach_file { width: 0px; opacity: 0; }
.uploaded_files { width: 1%; margin-left: 5px; margin-top: 5px; margin-bottom: 5px; }
Expand All @@ -25,9 +25,9 @@
.draft_title { top: 10px; right: 10px; }
.draft_list a { font-size: 115%; padding-right: 10px; }
.draft_list img { float: right; opacity: .4; vertical-align: -3px; cursor: pointer; }
.CodeMirror { border: solid 1px #ddd; border-top: none; margin-left: 5px; border-radius: 0px 0px 3px 3px; width: 100%; }
.CodeMirror { border: solid 1px #ddd; border-top: none; border-bottom-left-radius: var(--bs-border-radius); border-bottom-right-radius: var(--bs-border-radius); width: 100%; }
.editor-toolbar * { border: none !important; }
.editor-toolbar { z-index: 0; margin-left: 5px; margin-top: 10px; border: solid 1px #ccc; width: 100%; border-radius: 3px 3px 0px 0px; }
.editor-toolbar { z-index: 0; margin-top: 10px; border: solid 1px #ccc; width: 100%; border-top-left-radius: var(--bs-border-radius); border-top-right-radius: var(--bs-border-radius); }
.editor-statusbar { border-top: none !important; }
.editor-toolbar:before, .editor-toolbar:after { background: none !important; }
.meter { height: 5px; position: relative; background: #ede8e6; overflow: hidden;}
Expand Down
8 changes: 8 additions & 0 deletions modules/smtp/site.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,6 +454,14 @@ $(function () {
});

$('.smtp_send_placeholder').on("click", function (e) {
if (window.kindEditor) {
kindEditor.sync();
}

if (window.mdEditor) {
mdEditor.codemirror.save();
}

const body = $('.compose_body').val().trim();
const subject = $('.compose_subject').val().trim();

Expand Down
Loading