Author: sshyrkov
Date: Thu Jan 24 22:01:34 2008
New Revision: 19578
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D19578&repname=
=3Djahia
Log:
Do not include Ajax batch workflow state loader (JahiaWorkflowStateInfo) co=
de if the 'workflow_display_batch_loading' is set to false (introduced in S=
QLIMA-11 patch)
Modified:
trunk/core/src/webapp/jsp/jahia/topbar/topmenu.inc
Modified: trunk/core/src/webapp/jsp/jahia/topbar/topmenu.inc
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/topbar/topmenu.inc&rev=3D19578&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/topbar/topmenu.inc (original)
+++ trunk/core/src/webapp/jsp/jahia/topbar/topmenu.inc Thu Jan 24 22:01:34 =
2008
@@ -40,6 +40,7 @@
%>
<logic:notEqual name=3D"currentRequest" property=3D"normalMode" value=3D"t=
rue">
<script type=3D"text/javascript" src=3D"<%=3D request.getContextPath() %>/=
jsp/jahia/javascript/prototype/proto15sc17-compressed.js"></script>
+<% if (jParams.settings().isWflowStateBatchLoading()) { %>
<script type=3D"text/javascript" src=3D"<%=3D request.getContextPath() %>/=
jsp/jahia/javascript/workflow.js"></script>
<script type=3D"text/javascript">
Event.observe(window, 'load', function () {
@@ -47,10 +48,10 @@
jahia.config.pageId =3D '<%=3D jParams.getPageID() %>';
new JahiaWorkflowStateInfo().showState();
});
-
-// break protype memory leaks for all browsers (not only ie)
+</script>
+<% } %>
+<script type=3D"text/javascript">
Event.observe(window, 'unload', Event.unloadCache);
- =
</script>
</logic:notEqual>
=
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
