Author: michiel
Date: 2010-03-31 14:05:46 +0200 (Wed, 31 Mar 2010)
New Revision: 41702
Modified:
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/lazy.tagx
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/pathsearch.tagx
Log:
using live events to better separate functionality, and also to make
mm-sr:pathsearch work in a lazy-loaded item
Modified:
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/lazy.tagx
===================================================================
---
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/lazy.tagx
2010-03-31 12:05:19 UTC (rev 41701)
+++
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/lazy.tagx
2010-03-31 12:05:46 UTC (rev 41702)
@@ -32,7 +32,7 @@
</c:otherwise>
</c:choose>
- <div class="unloaded">
+ <div class="unloaded lazy">
<mm:link page="${absolutehref}" absolute="context">
<a href="${_}" class="lazyloading node_${_node}">
<img class='loader icon'
src="${mm:link('/mmbase/style/ajax-loader.gif')}" />
Modified:
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/pathsearch.tagx
===================================================================
---
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/pathsearch.tagx
2010-03-31 12:05:19 UTC (rev 41701)
+++
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/pathsearch.tagx
2010-03-31 12:05:46 UTC (rev 41702)
@@ -19,7 +19,7 @@
description="Node types to search. This is
equivalent to the path attribute of an mm:listnodescontainer" />
<jsp:directive.attribute name="searchdirs" type="java.lang.String"
- description="This is equivalent to the searchdirs
attribute of an mm:listnodescontainer" />
+ description="This is equivalent to the searchdirs
attribute of an mm:listnodescontainer" />
<jsp:directive.attribute name="element" type="java.lang.String"
description="This is equivalent to the element
attribute of an mm:listnodescontainer, but it defaults to the _last_ element."
/>
@@ -32,7 +32,12 @@
<jsp:directive.attribute name="load" type="java.lang.String"
description="" />
+ <jsp:directive.attribute name="forms" type="java.lang.Boolean"
+ />
+ <mm:import externid="org.mmbase.in_form" id="in_form"
vartype="boolean">false</mm:import>
+ <mm:import id="_forms" vartype="boolean">${empty forms ? ! in_form :
forms}</mm:import>
+
<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}" />
@@ -41,8 +46,7 @@
<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" />
+ <jsp:directive.include file="/mmbase/searchrelate/path/javascript.jspf" />
</c:if>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
