Author: sshyrkov
Date: Wed Oct 10 17:05:19 2007
New Revision: 18820
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18820&repname=
=3Djahia
Log:
Do not break window.onunload assignment
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/engine.j=
sp
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/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=3D18820&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 Wed Oct 10 17:05:19 2007
@@ -195,6 +195,11 @@
jspSource: '<%=3DjspSource%>',
sendKeepAliveTimeOut: <%=3D session.getMaxInactiveInterval() * 1000 / =
2 %> =
};
+<% if (results !=3D null) {%>
+ window.onunload =3D null;
+<%} else {%>
+ window.onunload =3D closeTheWindow;
+<%}%>
</script>
<% if (request.getAttribute("org.jahia.engines.html.headers") !=3D null) {=
%>
<%=3D (String) request.getAttribute("org.jahia.engines.html.headers") %>
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=3D18820&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 Wed Oct 10 17:05:19 2007
@@ -194,11 +194,6 @@
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
