From 3069eaf35e833ffe4a1c1c7829dd7e168ae27420 Mon Sep 17 00:00:00 2001 From: Ciro Mattia Gonano Date: Wed, 11 Sep 2013 15:56:48 +0200 Subject: Merge up to r3319 --- framework/Web/Javascripts/source/prototype-1.7/prototype.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'framework/Web/Javascripts/source/prototype-1.7/prototype.js') 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; })(); -- cgit v1.2.3