From 140d6e90638752a6d14738fcaa891fc3a7cd81fd Mon Sep 17 00:00:00 2001 From: svncommit Date: Thu, 17 Apr 2008 04:17:55 +0000 Subject: [PATCH] fix HTML mail sending --- CHANGELOG | 4 ++++ program/js/app.js | 4 +++- program/steps/settings/edit_identity.inc | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index dcb86ab13..8f91d15f2 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,10 @@ CHANGELOG RoundCube Webmail --------------------------- +2008/04/12 (estadtherr) +---------- +- Fix mail sending with new TinyMCE + 2008/04/16 (alec) ---------- - Fix typo in set_charset() (#1484991) diff --git a/program/js/app.js b/program/js/app.js index 98eb9d8ac..91389415a 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -1792,7 +1792,9 @@ function rcube_webmail() } // check for empty body - if ((input_message.value == '' && (!window.tinyMCE || tinyMCE.getContent() == '')) && !confirm(this.get_label('nobodywarning'))) + if ((input_message.value == '' && + (!window.tinyMCE || tinyMCE.get('compose-body').getContent() == '')) && + !confirm(this.get_label('nobodywarning'))) { input_message.focus(); return false; diff --git a/program/steps/settings/edit_identity.inc b/program/steps/settings/edit_identity.inc index 37fbbcaff..2dec5b258 100644 --- a/program/steps/settings/edit_identity.inc +++ b/program/steps/settings/edit_identity.inc @@ -49,7 +49,7 @@ function rcube_identity_form($attrib) $OUTPUT->add_script("tinyMCE.init({ mode : 'textareas'," . "editor_selector : 'mce_editor'," . "apply_source_formatting : true," . - "language : '$tinylang'," . + "language : '$tinylang'," . "content_css : '\$__skin_path' + '/editor_content.css'," . "theme : 'advanced'," . "theme_advanced_toolbar_location : 'top'," .