- Fixed error in IE7 (#1488017)

git-svn-id: https://svn.roundcube.net/trunk@5006 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 16 insertions, 4 deletions

diff --git a/roundcubemail/program/js/common.js b/roundcubemail/program/js/common.js
index cacf0ff8e..c5f466ae7 100644
--- a/roundcubemail/program/js/common.js
+++ b/roundcubemail/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;
 }