From 8f142e3489af2f264f98b40105846b625a2ecc91 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 04 Nov 2011 11:12:31 -0400
Subject: [PATCH] - Don't use external js file for images listing in HTML editor
---
/dev/null | 12 ------------
program/js/editor.js | 17 ++++++++++++++++-
2 files changed, 16 insertions(+), 13 deletions(-)
diff --git a/program/js/editor.js b/program/js/editor.js
index 63186fb..9ad50ce 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -31,7 +31,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
};
@@ -129,3 +129,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;
+};
diff --git a/program/js/editor_images.js b/program/js/editor_images.js
deleted file mode 100644
index 28e6bec..0000000
--- a/program/js/editor_images.js
+++ /dev/null
@@ -1,12 +0,0 @@
-
-var rc_client = tinyMCEPopup.getParam("rc_client");
-if (rc_client.env.attachments)
-{
- var tinyMCEImageList = new Array();
- for (var id in rc_client.env.attachments)
- {
- var att = rc_client.env.attachments[id];
- if (att.complete && att.mimetype.indexOf('image/') == 0)
- tinyMCEImageList.push([att.name, rc_client.env.comm_path+'&_action=display-attachment&_file='+id+'&_id='+rc_client.env.compose_id]);
- }
-};
--
Gitblit v1.9.1