Merge up to r3319

1 files changed, 5 insertions, 2 deletions

diff --git a/framework/Web/Javascripts/source/prototype-1.7/prototype.js b/framework/Web/Javascripts/source/prototype-1.7/prototype.js
index 37dd39ac..de5fff4a 100644
--- a/framework/Web/Javascripts/source/prototype-1.7/prototype.js
+++ b/framework/Web/Javascripts/source/prototype-1.7/prototype.js
@@ -2755,9 +2755,12 @@ Ajax.PeriodicalUpdater = Class.create(Ajax.Base, {
   }
 
   var PROBLEMATIC_ATTRIBUTE_READING = (function() {
-    DIV.setAttribute('onclick', Prototype.emptyFunction);
+    // This test used to set 'onclick' to `Prototype.emptyFunction`, but that
+    // caused an (uncatchable) error in IE 10. For some reason, switching to
+    // an empty array prevents this issue.
+    DIV.setAttribute('onclick', []);
     var value = DIV.getAttribute('onclick');
-    var isFunction = (typeof value === 'function');
+    var isFunction = Object.isArray(value);
     DIV.removeAttribute('onclick');
     return isFunction;
   })();