Author: sshyrkov Date: Tue Oct 9 15:25:47 2007 New Revision: 18796 URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18796&repname= =3Djahia Log: JAHIA-2441: Display problem in workflow engine =
http://www.jahia.net/jira/browse/JAHIA-2441 Resolution: correct side-effect (my fault) of another fix Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/engin= es.js Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript= /engines.js URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP= -BRANCH/core/src/webapp/jsp/jahia/javascript/engines.js&rev=3D18796&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 --- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/engin= es.js (original) +++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/javascript/engin= es.js Tue Oct 9 15:25:47 2007 @@ -136,13 +136,6 @@ }); } = - function handleOnLoad() { - //if (workInProgress && !workInProgress.closed) workInProgress.c= lose(); = - setTimeout("checkParent()", checkParentTimeOut); - setTimeout("sendKeepAlive()", jahia.config.sendKeepAliveTimeOut); - engineCustomHandleOnLoad(); - } - = function engineCustomHandleOnLoad(){ // should be overriden by sub engine for specific onload code = } @@ -165,11 +158,6 @@ } } } - if (jahia.config.lockResults) { - window.onunload =3D null; - } else { - window.onunload =3D closeTheWindow; - } = // resize pageBody function resizePagebody() { @@ -197,8 +185,20 @@ } } = - Event.observe(window, 'load', handleOnLoad); - // javascript method "resizePageBody" doesn't work with ajax call becau= se we didn't know pageBodyEle size - if ('advworkflow' !=3D jahia.config.jspSource){ - Event.observe(window, 'load', resizePagebody); - } \ No newline at end of file + function handleOnLoad() { + //if (workInProgress && !workInProgress.closed) workInProgress.clo= se(); = + setTimeout("checkParent()", checkParentTimeOut); + setTimeout("sendKeepAlive()", jahia.config.sendKeepAliveTimeOut); + engineCustomHandleOnLoad(); + // javascript method "resizePageBody" doesn't work with ajax call = because we didn't know pageBodyEle size + if ('advworkflow' !=3D jahia.config.jspSource){ + resizePagebody(); + } + if (jahia.config.lockResults) { + window.onunload =3D null; + } else { + window.onunload =3D closeTheWindow; + } + } + = +Event.observe(window, 'load', handleOnLoad); \ No newline at end of file _______________________________________________ cvs_list mailing list [email protected] http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
