Author: michiel
Date: 2010-03-30 18:38:50 +0200 (Tue, 30 Mar 2010)
New Revision: 41689
Modified:
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/WEB-INF/tags/mm/searchrelateexample/html.tagx
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/pathsearch.tagx
Log:
arrange autoloading of javascrit
Modified:
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/WEB-INF/tags/mm/searchrelateexample/html.tagx
===================================================================
---
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/WEB-INF/tags/mm/searchrelateexample/html.tagx
2010-03-30 16:24:36 UTC (rev 41688)
+++
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/WEB-INF/tags/mm/searchrelateexample/html.tagx
2010-03-30 16:38:50 UTC (rev 41689)
@@ -47,9 +47,6 @@
<mm:link page="/style.css">
<link rel="stylesheet" href="${_}" type="text/css" />
</mm:link>
- <mm:link page="/mmbase/searchrelate/PathSearcher.js.jsp">
- <script type="text/javascript" src="${_}"><jsp:text>
</jsp:text></script>
- </mm:link>
<meta name="ContentRoot" content="${mm:link('/')}" />
Modified:
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/pathsearch.tagx
===================================================================
---
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/pathsearch.tagx
2010-03-30 16:24:36 UTC (rev 41688)
+++
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/pathsearch.tagx
2010-03-30 16:38:50 UTC (rev 41689)
@@ -27,12 +27,22 @@
<jsp:directive.attribute name="config" type="java.lang.String"
description="Configuration file defaults to
('searchrelate')" />
+ <jsp:directive.attribute name="load" type="java.lang.String"
+ description="" />
+
<mm:import id="requestid">P<mm:escape
escape="crc32,radix(36)">${pageContext.request.requestURI}</mm:escape>${param.requestID}</mm:import>
<mm:import from="request" id="seq" externid="${requestid}_sequence"
vartype="integer">0</mm:import>
<mm:write request="${requestid}_sequence" value="${seq + 1}" />
<mm:import id="pid">${requestid}_${seq}</mm:import>
+ <mm:import from="request" id="javascript_loaded"
externid="mm_pathsearch_javascript" />
+ <mm:import id="_load">${((empty javascript_loaded and empty load) or load)
and load ne 'false' and param['org.mmbase.sr.relatednodes.load'] ne
'false'}</mm:import>
+ <c:if test="${_load}">
+ <script type="text/javascript"
src="${mm:link('/mmbase/searchrelate/PathSearcher.js.jsp')}"><jsp:text><!--
--></jsp:text></script>
+ <mm:write request="mm_pathsearch_javascript" value="yes" />
+ </c:if>
+
<mm:listnodescontainer path="${path}" element="${element}" id="query"
jspvar="q">
<c:if test="${empty element}">
<jsp:scriptlet>q.setNodeStep(q.getSteps().get(q.getSteps().size() -
1));</jsp:scriptlet>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
