From 3412e50b54e3daac8745234e21ab6e72be0ed165 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Wed, 04 Jun 2014 11:20:33 -0400
Subject: [PATCH] Fix attachment menu structure and aria-attributes
---
plugins/attachment_reminder/attachment_reminder.js | 69 ++++++++++++++++++++++++----------
1 files changed, 49 insertions(+), 20 deletions(-)
diff --git a/plugins/attachment_reminder/attachment_reminder.js b/plugins/attachment_reminder/attachment_reminder.js
index 01f2b49..d6cf8e4 100755
--- a/plugins/attachment_reminder/attachment_reminder.js
+++ b/plugins/attachment_reminder/attachment_reminder.js
@@ -1,4 +1,19 @@
-/* Attachment Reminder plugin script */
+/**
+ * Attachment Reminder plugin script
+ *
+ * @licstart The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
+ * Copyright (c) 2013, The Roundcube Dev Team
+ *
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * @licend The above is the entire license notice
+ * for the JavaScript code in this file.
+ */
function rcmail_get_compose_message()
{
@@ -14,25 +29,43 @@
}
return msg;
-}
+};
function rcmail_check_message(msg)
{
- var i, rg, keywords = rcmail.gettext('keywords', 'attachment_reminder').split(",").concat([".doc", ".pdf"]);
+ var i, rx, keywords = rcmail.gettext('keywords', 'attachment_reminder').split(",").concat([".doc", ".pdf"]);
- for (i=0; i<keywords.length; i++) {
- rg = new RegExp(keywords[i],'i');
- if (msg.search(rg) != -1)
- return true;
- }
+ keywords = $.map(keywords, function(n) { return RegExp.escape(n); });
+ rx = new RegExp('(' + keywords.join('|') + ')', 'i');
- return false;
-}
+ return msg.search(rx) != -1;
+};
function rcmail_have_attachments()
{
return rcmail.env.attachments && $('li', rcmail.gui_objects.attachmentlist).length;
-}
+};
+
+function rcmail_attachment_reminder_dialog()
+{
+ var buttons = {};
+
+ buttons[rcmail.gettext('addattachment')] = function() {
+ $(this).remove();
+ if (window.UI && UI.show_uploadform) // Larry skin
+ UI.show_uploadform();
+ else if (window.rcmail_ui && rcmail_ui.show_popup) // classic skin
+ rcmail_ui.show_popup('uploadmenu', true);
+ };
+ buttons[rcmail.gettext('send')] = function(e) {
+ $(this).remove();
+ rcmail.env.attachment_reminder = true;
+ rcmail.command('send', '', e);
+ };
+
+ rcmail.env.attachment_reminder = false;
+ rcmail.show_popup_dialog(rcmail.gettext('attachment_reminder.forgotattachment'), '', buttons);
+};
if (window.rcmail) {
@@ -40,15 +73,11 @@
var msg = rcmail_get_compose_message(),
subject = $('#compose-subject').val();
- if (!rcmail_have_attachments() && (rcmail_check_message(msg) || rcmail_check_message(subject))) {
- if (confirm(rcmail.gettext('forgotattachment', 'attachment_reminder'))) {
- if (window.UI && UI.show_uploadform) // Larry skin
- UI.show_uploadform();
- else if (window.rcmail_ui && rcmail_ui.show_popup) // classic skin
- rcmail_ui.show_popup('uploadmenu', true);
-
- return false;
- }
+ if (!rcmail.env.attachment_reminder && !rcmail_have_attachments()
+ && (rcmail_check_message(msg) || rcmail_check_message(subject))
+ ) {
+ rcmail_attachment_reminder_dialog();
+ return false;
}
});
}
--
Gitblit v1.9.1