From 9efa95ea9b51cec0a12502455e9c27e64e3aae14 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 27 Feb 2012 07:12:41 -0500
Subject: [PATCH] Better manual upgrading instructions: rsync plugins and skins to keep manually installed stuff

---
 program/js/editor.js |   27 ++++++++++++++++++++++++---
 1 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/program/js/editor.js b/program/js/editor.js
index 63186fb..e95ead1 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -3,8 +3,11 @@
  | Roundcube editor js library                                           |
  |                                                                       |
  | This file is part of the Roundcube web development suite              |
- | Copyright (C) 2006, The Roundcube Dev Team                            |
- | Licensed under the GNU GPL                                            |
+ | Copyright (C) 2006-2012, The Roundcube Dev Team                       |
+ |                                                                       |
+ | Licensed under the GNU General Public License version 3 or            |
+ | any later version with exceptions for skins & plugins.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  +-----------------------------------------------------------------------+
  | Author: Eric Stadtherr <estadtherr@gmail.com>                         |
@@ -31,7 +34,7 @@
       remove_script_host: false,
       gecko_spellcheck: true,
       convert_urls: false, // #1486944
-      external_image_list_url: 'program/js/editor_images.js',
+      external_image_list: window.rcmail_editor_images,
       rc_client: rcmail
     };
 
@@ -65,6 +68,9 @@
 {
   var 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);
 
   if (elem && elem.type == 'select-one') {
     rcmail.change_identity(elem);
@@ -129,3 +135,18 @@
       select.checked = true;
   }
 }
+
+// editor callbeck for images listing
+function rcmail_editor_images()
+{
+  var i, files = rcmail.env.attachments, list = [];
+
+  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]);
+    }
+  }
+
+  return list;
+};

--
Gitblit v1.9.1