- Fixed error in IE7 (#1488017)

13 years ago · 6e16260e63
parent 2dd2bf5012
commit 6e16260e63
1 changed files with 16 additions and 4 deletions
--- 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;
 }