Author: sshyrkov Date: Fri Aug 31 11:04:25 2007 New Revision: 18320 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18320&repname= =3Djahia Log: JAHIA-2203: sP3: wai checking: Work in progress pop-up does not close itsel= f correctly =
http://www.jahia.net/jira/browse/JAHIA-2203 Resolution: handle window.onload properly Modified: trunk/core/src/webapp/jsp/jahia/engines/engine.jsp Modified: trunk/core/src/webapp/jsp/jahia/engines/engine.jsp URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp= /jsp/jahia/engines/engine.jsp&rev=3D18320&repname=3Djahia =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- trunk/core/src/webapp/jsp/jahia/engines/engine.jsp (original) +++ trunk/core/src/webapp/jsp/jahia/engines/engine.jsp Fri Aug 31 11:04:25 = 2007 @@ -299,10 +299,6 @@ openWorkInProgressWindow('<%=3Drequest.getContextPath()%>'); } = - window.onload =3D function() { - handleOnLoad(); - } - = var checkParentTimeOut =3D 500; function checkParent() { if (!window.opener || = @@ -323,11 +319,11 @@ } }); } - setTimeout("sendKeepAlive()", sendKeepAliveTimeOut); = function handleOnLoad() { if (workInProgress && !workInProgress.closed) workInProgress.clo= se(); = setTimeout("checkParent()", checkParentTimeOut); + setTimeout("sendKeepAlive()", sendKeepAliveTimeOut); } = = function closeTheWindow() { @@ -355,6 +351,8 @@ <% } else { %> window.onunload =3D closeTheWindow; <% } %> + + Event.observe(window, 'load', handleOnLoad); </script> = </head> _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
