From d06e57fdf21879a4e93d6c00b939ca42094d3e86 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 21 Sep 2011 16:43:47 -0400
Subject: [PATCH] Skip confirmation dialog when deleting a contact from a source that supports undelete operations
---
program/js/common.js | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 deletions(-)
diff --git a/program/js/common.js b/program/js/common.js
index cacf0ff..0011fea 100644
--- a/program/js/common.js
+++ b/program/js/common.js
@@ -171,14 +171,12 @@
var opcode = 0;
e = e || window.event;
- if (bw.mac && e) {
+ if (bw.mac && e)
opcode += (e.metaKey && CONTROL_KEY) + (e.shiftKey && SHIFT_KEY);
- return opcode;
- }
- if (e) {
+ else if (e)
opcode += (e.ctrlKey && CONTROL_KEY) + (e.shiftKey && SHIFT_KEY);
- return opcode;
- }
+
+ return opcode;
},
/**
@@ -347,13 +345,25 @@
break;
}
}
-
- if (ret)
- delete ret.event;
+ if (ret && ret.event) {
+ try {
+ delete ret.event;
+ } catch (err) {
+ // IE6-7 doesn't support deleting HTMLFormElement attributes (#1488017)
+ $(ret).removeAttr('event');
+ }
+ }
}
this._event_exec = false;
- delete e.event;
+ if (e.event) {
+ try {
+ delete e.event;
+ } catch (err) {
+ // IE6-7 doesn't support deleting HTMLFormElement attributes (#1488017)
+ $(e).removeAttr('event');
+ }
+ }
return ret;
}
--
Gitblit v1.9.1