From 075574c81f6d8c1db3c2f2dba1a3f084fcb810d8 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 14 Oct 2013 06:11:09 -0400
Subject: [PATCH] Use onclick even for status, flag and expando actions to fix issue where mouse right click would invoke action where it shouldn't
---
program/js/app.js | 39 +++++++++++++++++++++------------------
1 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index 24aaca0..7fbab80 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1713,7 +1713,7 @@
// set eventhandler to status icon
if (row.icon = document.getElementById(status_icon)) {
row.icon._row = row.obj;
- row.icon.onmousedown = function(e) { self.command('toggle_status', this); rcube_event.cancel(e); };
+ row.icon.onclick = function(e) { self.command('toggle_status', this); return rcube_event.cancel(e); };
}
// save message icon position too
@@ -1725,12 +1725,12 @@
// set eventhandler to flag icon, if icon found
if (this.env.flagged_col != null && (row.flagicon = document.getElementById('flagicn'+row.uid))) {
row.flagicon._row = row.obj;
- row.flagicon.onmousedown = function(e) { self.command('toggle_flag', this); rcube_event.cancel(e); };
+ row.flagicon.onclick = function(e) { self.command('toggle_flag', this); return rcube_event.cancel(e); };
}
if (!row.depth && row.has_children && (expando = document.getElementById('rcmexpando'+row.uid))) {
row.expando = expando;
- expando.onmousedown = function(e) { return self.expand_message_row(e, uid); };
+ expando.onclick = function(e) { return self.expand_message_row(e, uid); };
if (bw.touch) {
expando.addEventListener('touchend', function(e) {
if (e.changedTouches.length == 1) {
@@ -2832,10 +2832,10 @@
{
var len = a_uids.length,
i, uid, all_deleted = true,
- rows = this.message_list ? this.message_list.rows : [];
+ rows = this.message_list ? this.message_list.rows : {};
if (len == 1) {
- if (!rows.length || (rows[a_uids[0]] && !rows[a_uids[0]].deleted))
+ if (!this.message_list || (rows[a_uids[0]] && !rows[a_uids[0]].deleted))
this.flag_as_deleted(a_uids);
else
this.flag_as_undeleted(a_uids);
@@ -2876,7 +2876,7 @@
var r_uids = [],
post_data = this.selection_post_data({_uid: this.uids_to_list(a_uids), _flag: 'delete'}),
lock = this.display_message(this.get_label('markingmessage'), 'loading'),
- rows = this.message_list ? this.message_list.rows : [],
+ rows = this.message_list ? this.message_list.rows : {},
count = 0;
for (var i=0, len=a_uids.length; i<len; i++) {
@@ -2896,7 +2896,7 @@
// make sure there are no selected rows
if (this.env.skip_deleted && this.message_list) {
- if(!this.env.display_next)
+ if (!this.env.display_next)
this.message_list.clear_selection();
if (count < 0)
post_data._count = (count*-1);
@@ -2920,7 +2920,7 @@
this.flag_deleted_as_read = function(uids)
{
var icn_src, uid, i, len,
- rows = this.message_list ? this.message_list.rows : [];
+ rows = this.message_list ? this.message_list.rows : {};
uids = String(uids).split(',');
@@ -3427,7 +3427,8 @@
message = input_message.val(),
is_html = ($("input[name='_is_html']").val() == '1'),
sig = this.env.identity,
- delim = this.env.recipients_delimiter,
+ delim = this.env.recipients_separator,
+ rx_delim = RegExp.escape(delim),
headers = ['replyto', 'bcc'];
// update reply-to/bcc fields with addresses defined in identities
@@ -3444,16 +3445,18 @@
}
// cleanup
- rx = new RegExp(RegExp.escape(delim) + '\\s*' + RegExp(delim), 'g');
- input_val = input_val.replace(rx, delim)
- rx = new RegExp('^\\s*' + RegExp.escape(delim) + '\\s*$');
- input_val = input_val.replace(rx, '')
+ rx = new RegExp(rx_delim + '\\s*' + rx_delim, 'g');
+ input_val = input_val.replace(rx, delim);
+ rx = new RegExp('^[\\s' + rx_delim + ']+');
+ input_val = input_val.replace(rx, '');
// add new address(es)
- if (new_val) {
- rx = new RegExp(RegExp.escape(delim) + '\\s*$');
- if (input_val && !rx.test(input_val))
- input_val += delim + ' ';
+ if (new_val && input_val.indexOf(new_val) == -1 && input_val.indexOf(new_val.replace(/"/g, '')) == -1) {
+ if (input_val) {
+ rx = new RegExp('[' + rx_delim + '\\s]+$')
+ input_val = input_val.replace(rx, '') + delim + ' ';
+ }
+
input_val += new_val + delim + ' ';
}
@@ -3802,7 +3805,7 @@
// refresh the folder where sent message was saved or replied message comes from
if (folders && rc.env.task == 'mail' && rc.env.action == '' && $.inArray(rc.env.mailbox, folders) >= 0) {
// @TODO: try with 'checkmail' here when #1485186 is fixed. See also #1489249.
- rc.command('list', rc.env.mailbox);
+ rc.command('list');
}
}
setTimeout(function(){ window.close() }, 1000);
--
Gitblit v1.9.1