From 2a352732b5b2d086cdd1088883bc847adef3742b Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 22 May 2016 08:43:34 -0400
Subject: [PATCH] Use minified publickey.js (with cache-buster) when available (#5254)
---
program/steps/mail/compose.inc | 1 +
program/js/app.js | 8 --------
2 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index e6203de..7dbe3b7 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -3577,14 +3577,6 @@
// list recipients with missing keys
if (!isvalid && missing_keys.length) {
- // load publickey.js
- if (!$('script#publickeyjs').length) {
- $('<script>')
- .attr('id', 'publickeyjs')
- .attr('src', ref.assets_path('program/js/publickey.js'))
- .appendTo(document.body);
- }
-
// display dialog with missing keys
ref.show_popup_dialog(
ref.get_label('nopubkeyfor').replace('$email', missing_keys.join(', ')) +
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 83019cf..b2b32b3 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -285,6 +285,7 @@
// process $MESSAGE body/attachments, set $MESSAGE_BODY/$HTML_MODE vars and some session data
$MESSAGE_BODY = rcmail_prepare_message_body();
+$OUTPUT->include_script('publickey.js');
// register UI objects
$OUTPUT->add_handlers(array(
--
Gitblit v1.9.1