summaryrefslogtreecommitdiff
path: root/program/js
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-04-11 12:24:00 +0000
committeralecpl <alec@alec.pl>2011-04-11 12:24:00 +0000
commitd3105370870a8c51aaeb6a18f561311202da3356 (patch)
tree9b0d50549f35a44d7eb438bd7ad3dfa9ca72d263 /program/js
parent382b8b1351e1a4598f04ab184cec803b96d7e4b7 (diff)
- Apply fixes from trunk
Diffstat (limited to 'program/js')
-rw-r--r--program/js/app.js17
1 files changed, 8 insertions, 9 deletions
diff --git a/program/js/app.js b/program/js/app.js
index 38141a92f..d752a768b 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -2994,11 +2994,11 @@ function rcube_webmail()
this.compose_field_hash = function(save)
{
// check input fields
- var value_to = $("[name='_to']").val();
- var value_cc = $("[name='_cc']").val();
- var value_bcc = $("[name='_bcc']").val();
- var value_subject = $("[name='_subject']").val();
- var str = '';
+ var ed, str = '',
+ value_to = $("[name='_to']").val(),
+ value_cc = $("[name='_cc']").val(),
+ value_bcc = $("[name='_bcc']").val(),
+ value_subject = $("[name='_subject']").val();
if (value_to)
str += value_to+':';
@@ -3009,9 +3009,8 @@ function rcube_webmail()
if (value_subject)
str += value_subject+':';
- var editor = tinyMCE.get(this.env.composebody);
- if (editor)
- str += editor.getContent();
+ if (window.tinyMCE && (ed = tinyMCE.get(this.env.composebody)))
+ str += ed.getContent();
else
str += $("[name='_message']").val();
@@ -4622,7 +4621,7 @@ function rcube_webmail()
var current_li, target_li;
if ((current_li = this.get_folder_li(old, prefix))) {
- $(current_li).removeClass('selected').removeClass('unfocused');
+ $(current_li).removeClass('selected').addClass('unfocused');
}
if ((target_li = this.get_folder_li(name, prefix))) {
$(target_li).removeClass('unfocused').addClass('selected');