summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--program/js/common.js20
1 files changed, 16 insertions, 4 deletions
diff --git a/program/js/common.js b/program/js/common.js
index cacf0ff8e..c5f466ae7 100644
--- a/program/js/common.js
+++ b/program/js/common.js
@@ -347,13 +347,25 @@ triggerEvent: function(evt, e)
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;
}