From ada51d1d0eac8a1c4448a664c42e8712bce9e650 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Sat, 19 Oct 2013 09:51:30 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
program/js/list.js | 11 +----------
1 files changed, 1 insertions(+), 10 deletions(-)
diff --git a/program/js/list.js b/program/js/list.js
index f05ac1a..cb69bc4 100644
--- a/program/js/list.js
+++ b/program/js/list.js
@@ -50,7 +50,6 @@
this.keyboard = false;
this.toggleselect = false;
- this.dont_select = false;
this.drag_active = false;
this.col_drag_active = false;
this.column_fixed = null;
@@ -409,7 +408,7 @@
var evtarget = rcube_event.get_target(e),
tagname = evtarget.tagName.toLowerCase();
- if (this.dont_select || (evtarget && (tagname == 'input' || tagname == 'img' || evtarget.onclick)))
+ if (evtarget && (tagname == 'input' || tagname == 'img' || (tagname != 'a' && evtarget.onclick)))
return true;
// accept right-clicks
@@ -454,12 +453,6 @@
if ((evtarget && (tagname == 'input' || tagname == 'img')))
return true;
-
- // don't do anything (another action processed before)
- if (this.dont_select) {
- this.dont_select = false;
- return false;
- }
var dblclicked = now - this.rows[id].clicked < this.dblclick_time;
@@ -509,8 +502,6 @@
evtarget = rcube_event.get_target(e),
mod_key = rcube_event.get_modifier(e);
- // Don't select this message
- this.dont_select = true;
// Don't treat double click on the expando as double click on the message.
row.clicked = 0;
--
Gitblit v1.9.1