Author: sshyrkov Date: Fri Aug 31 11:03:58 2007 New Revision: 18319 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18319&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: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/engine.j= sp Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/en= gine.jsp URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/webapp/jsp/jahia/engines/engine.jsp&rev=3D18319&repname=3D= jahia =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 --- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/engine.j= sp (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/engine.j= sp Fri Aug 31 11:03:58 2007 @@ -289,10 +289,6 @@ openWorkInProgressWindow('<%=3Drequest.getContextPath()%>'); } = - window.onload =3D function() { - handleOnLoad(); - } - var checkParentTimeOut =3D 500; function checkParent() { if (!window.opener || @@ -313,15 +309,14 @@ } }); } - setTimeout("sendKeepAlive()", sendKeepAliveTimeOut); = function handleOnLoad() { if (workInProgress && !workInProgress.closed) workInProgress.clo= se(); = setTimeout("checkParent()", checkParentTimeOut); + setTimeout("sendKeepAlive()", sendKeepAliveTimeOut); engineCustomHandleOnLoad(); } = - = function engineCustomHandleOnLoad(){ // should be overriden by sub engine for specific onload code = } @@ -378,11 +373,13 @@ } } = + Event.observe(window, 'load', handleOnLoad); + Event.observe(window, 'load', resizePagebody); </script> = </head> = -<body onload=3D"javascript:resizePagebody();"> +<body> <div id=3D"userShell"> <div id=3D"wrapper"><!-- wrapper --> <form name=3D"mainForm" method=3D"post" action=3D"<%=3DengineUrl%>"> _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
