From 100d65777131ef5f8fb716691fc6defb1044e688 Mon Sep 17 00:00:00 2001 From: phuong_vu Date: Mon, 22 Apr 2013 14:23:13 +0700 Subject: [PATCH] GTNPORTAL-2908 Javascript bug on IE if there are portlet extra markup headers --- .../eXo/portal/PortalHttpRequest.js | 25 ++++++++++++------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalHttpRequest.js b/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalHttpRequest.js index 5a0ef3a9e..341996fbd 100644 --- a/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalHttpRequest.js +++ b/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalHttpRequest.js @@ -448,16 +448,23 @@ var script = markupHeadElements.scripts[i]; if (script.src) { - if (base.Browser.isIE()) { - script.onreadystatechange = function () { - if (/loaded|complete/.test(script.readyState)) { - script.onreadystatechange = null; - appendScript.apply(that); - } - }; + if (script.onreadystatechange !== undefined) { + script.onreadystatechange = (function(sci) { + return function () { + if (!sci.readyState || /loaded|complete/.test(sci.readyState)) { + sci.onreadystatechange = null; + appendScript.apply(that); + } + }; + })(script); } else { - script.onload = script.onerror = function() {appendScript.apply(that);}; - } + script.onload = (function(sci) { + return function() {sci.onload = null; appendScript.apply(that);}; + })(script); + } + script.onerror = (function(sci) { + return function() {sci.onerror = null; appendScript.apply(that);}; + })(script); } } appendScript.apply(that);