Aleksander Machniak
2014-10-28 50341eab4315d7dcefa40eb050f4bb8c544e5696
program/js/editor.js
@@ -23,7 +23,7 @@
      apply_source_formatting: true,
      theme: 'advanced',
      language: config.lang,
      content_css: config.skin_path + '/editor_content.css',
      content_css: config.skin_path + '/editor_content.css?v2',
      theme_advanced_toolbar_location: 'top',
      theme_advanced_toolbar_align: 'left',
      theme_advanced_buttons3: '',
@@ -61,6 +61,9 @@
        if (!active)
          rcmail.spellcheck_state();
      });
      ed.onKeyPress.add(function(ed, e) {
          rcmail.compose_type_activity++;
      });
    }
  }
@@ -74,14 +77,18 @@
// react to real individual tinyMCE editor init
function rcmail_editor_callback()
{
  var elem = rcube_find_object('_from'),
  var css = {},
    elem = rcube_find_object('_from'),
    fe = rcmail.env.compose_focus_elem;
  if (rcmail.env.default_font)
    $(tinyMCE.get(rcmail.env.composebody).getBody()).css('font-family', rcmail.env.default_font);
    css['font-family'] = rcmail.env.default_font;
  if (rcmail.env.default_font_size)
    $(tinyMCE.get(rcmail.env.composebody).getBody()).css('font-size', 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);
  if (elem && elem.type == 'select-one') {
    rcmail.change_identity(elem);
@@ -157,8 +164,8 @@
  for (i in files) {
    att = files[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]);
    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]);
    }
  }