amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-02 23:34:21 +00:00
Code Issues Projects Releases Wiki Activity

fix(core): Notify sgCkeditor component when clicking the send button to update content. Fixes #5952.

Browse Source
This commit is contained in:
smizrahi
2024-04-29 22:21:33 +02:00
parent 9b5a8cb6fc
commit c2d9050539
2 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/js/Common/sgCkeditor.component.js
+6 -13
View File
@@ -214,7 +214,6 @@
var editorChangedTimerValue = 2000;
var editorChangedTimer = null;
this.$onInit = function () {
vm.ngModelCtrl.$render = function () {
content = vm.ngModelCtrl.$viewValue;
@@ -280,18 +279,12 @@
// Add Emoticons
editor.plugins.get('SpecialCharacters').addItems('Emoji', emojis, { label: 'Emoticons' });
// if (vm.ckMargin) {
// // Set the margin of the iframe editable content
// vm.editor.editing.view.domRoots.get("main").style.marginTop = vm.ckMargin;
// vm.editor.editing.view.domRoots.get("main").style.marginLeft = vm.ckMargin;
// vm.editor.editing.view.domRoots.get("main").style.marginRight = vm.ckMargin;
// }
vm.editor.model.document.on('pasteState', function () { onEditorChange(false); });
vm.editor.model.document.on('change:data', function () { onEditorChange(false); });
vm.editor.model.document.on('paste', function () { onEditorChange(false); });
editor.editing.view.document.on('blur', function () { onEditorChange(true); });
vm.editor.model.document.on('pasteState', function () { vm.onEditorChange(false); });
vm.editor.model.document.on('change:data', function () { vm.onEditorChange(false); });
vm.editor.model.document.on('paste', function () { vm.onEditorChange(false); });
vm.editor.editing.view.document.on('blur', function () { vm.onEditorChange(true); });
vm.editor.component = this;
onInstanceReady();
@@ -341,7 +334,7 @@
vm.editor.destroy(noUpdate);
}
function onEditorChange(force) {
this.onEditorChange = function(force) {
if (editorChangedTimer)
clearTimeout(editorChangedTimer);
UI/WebServerResources/js/Mailer/MessageEditorController.js
+5
View File
@@ -27,6 +27,7 @@
this.sendState = false;
this.toggleFullscreen = toggleFullscreen;
this.firstFocus = true;
this.editor = null;
_initFileUploader();
@@ -251,6 +252,9 @@
};
this.send = function () {
if (this.editor && this.editor.component)
this.editor.component.onEditorChange(true); // Call onEditorChange on sgCkEditor component
this.sendState = 'sending';
if (this.autosave)
$timeout.cancel(this.autosave);
@@ -527,6 +531,7 @@
this.onHTMLReady = function ($editor) {
if (!this.isNew()) {
this.editor = $editor;
onCompletePromise().then(function() {
$editor.focus();
});