diff options
Diffstat (limited to 'program/js/editor.js')
| -rw-r--r-- | program/js/editor.js | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/program/js/editor.js b/program/js/editor.js index 020971d6e..bc36e9a39 100644 --- a/program/js/editor.js +++ b/program/js/editor.js @@ -41,7 +41,7 @@ function rcmail_editor_init(config) $.extend(conf, { plugins: 'paste,tabfocus', theme_advanced_buttons1: 'bold,italic,underline,strikethrough,justifyleft,justifycenter,justifyright,justifyfull,separator,outdent,indent,charmap,hr,link,unlink,code,forecolor', - theme_advanced_buttons2: 'fontselect,fontsizeselect' + theme_advanced_buttons2: ',fontselect,fontsizeselect' }); else { // mail compose $.extend(conf, { @@ -74,18 +74,11 @@ function rcmail_editor_init(config) // react to real individual tinyMCE editor init function rcmail_editor_callback() { - var css = {}, - elem = rcube_find_object('_from'), + var elem = rcube_find_object('_from'), fe = rcmail.env.compose_focus_elem; if (rcmail.env.default_font) - css['font-family'] = rcmail.env.default_font; - - if (rcmail.env.default_font_size) - css['font-size'] = rcmail.env.default_font_size; - - if (css['font-family'] || css['font-size']) - $(tinyMCE.get(rcmail.env.composebody).getBody()).css(css); + $(tinyMCE.get(rcmail.env.composebody).getBody()).css('font-family', rcmail.env.default_font); if (elem && elem.type == 'select-one') { rcmail.change_identity(elem); @@ -161,8 +154,8 @@ function rcmail_editor_images() for (i in files) { att = files[i]; - if (att.complete && att.mimetype.startsWith('image/')) { - list.push([att.name, rcmail.env.comm_path+'&_id='+rcmail.env.compose_id+'&_action=display-attachment&_file='+i]); + if (att.complete && att.mimetype.indexOf('image/') == 0) { + list.push([att.name, rcmail.env.comm_path+'&_action=display-attachment&_file='+i+'&_id='+rcmail.env.compose_id]); } } |