Author: michiel
Date: 2010-04-06 10:37:00 +0200 (Tue, 06 Apr 2010)
New Revision: 41764
Added:
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/path/javascript.jspf
Modified:
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/lazy.jspx
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/news-item-relations.jspx
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/pathsearch.jspx
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/lazy.tagx
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/search.tagx
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/List.js.jsp
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/PathSearcher.js.jsp
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/Toggle.js.jsp
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/list/lazy-part.jspx
Log:
ported some stuff from 1.9
Modified:
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/lazy.jspx
===================================================================
---
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/lazy.jspx
2010-04-03 15:24:19 UTC (rev 41763)
+++
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/lazy.jspx
2010-04-06 08:37:00 UTC (rev 41764)
@@ -5,6 +5,7 @@
xmlns:mm-sr="http://www.mmbase.org/tags/mm/searchrelate";
xmlns:jsp="http://java.sun.com/JSP/Page";
xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";>
+ <jsp:directive.include file="/mmbase/searchrelate/path/javascript.jspf" />
<mm-sre:form>
<mm:node number="default.mags">
Modified:
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/news-item-relations.jspx
===================================================================
---
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/news-item-relations.jspx
2010-04-03 15:24:19 UTC (rev 41763)
+++
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/news-item-relations.jspx
2010-04-06 08:37:00 UTC (rev 41764)
@@ -14,15 +14,17 @@
role="related"
min="1"
max="1"
+ implicitSearch="false"
search="true"
fields="number,firstname">
<h4><span class="debug">${rid} </span>authors</h4>
- </mm-sr:relatednodes>
+ </mm-sr:relatednodes>
<mm-sr:relatednodes
idvar="rid"
type="urls"
search="true"
sortable="true"
+ implicitSearch="false"
fields="url">
<h4><span class="debug">${rid} </span>urls</h4>
</mm-sr:relatednodes>
@@ -30,7 +32,11 @@
<mm-sr:relatednodes
idvar="rid"
type="images"
- search="true">
+ >
+ <jsp:attribute name="searcher">
+ <mm-sr:pathsearch path="news,images" />
+ </jsp:attribute>
<h4><span class="debug">${rid} </span>images</h4>
</mm-sr:relatednodes>
+
</div>
Modified:
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/pathsearch.jspx
===================================================================
---
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/pathsearch.jspx
2010-04-03 15:24:19 UTC (rev 41763)
+++
mmbase/trunk/applications/searchrelate/example-webapp/src/main/webapp/pathsearch.jspx
2010-04-06 08:37:00 UTC (rev 41764)
@@ -29,6 +29,8 @@
<p>Three step searcher, but element is set to the second step. You only find
news to which people are related now.</p>
<mm-sr:pathsearch path="mags,news,people" element="news" />
+ <p>A one step searcher is more or less the same as simply mm-sr:search</p>
+ <mm-sr:pathsearch path="news" />
<hr />
<mm:escape escape="links">$URL$</mm:escape>
Modified:
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/lazy.tagx
===================================================================
---
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/lazy.tagx
2010-04-03 15:24:19 UTC (rev 41763)
+++
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/lazy.tagx
2010-04-06 08:37:00 UTC (rev 41764)
@@ -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/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-04-03 15:24:19 UTC (rev 41763)
+++
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/pathsearch.tagx
2010-04-06 08:37:00 UTC (rev 41764)
@@ -20,6 +20,9 @@
<jsp:directive.attribute name="searchdirs" type="java.lang.String"
description="This is equivalent to the searchdirs
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" />
+
<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."
/>
@@ -31,7 +34,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}" />
@@ -40,8 +48,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>
Modified:
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/search.tagx
===================================================================
---
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/search.tagx
2010-04-03 15:24:19 UTC (rev 41763)
+++
mmbase/trunk/applications/searchrelate/src/main/resources/META-INF/tags/mm/searchrelate/search.tagx
2010-04-06 08:37:00 UTC (rev 41764)
@@ -31,6 +31,8 @@
<jsp:directive.attribute name="create" type="java.lang.Boolean"
/>
+ <jsp:directive.attribute name="forms" type="java.lang.Boolean"
+ />
<jsp:directive.attribute name="styleClass"
type="java.lang.String"
description="Extra style class" />
@@ -40,12 +42,16 @@
<mm:import id="_pagesize" vartype="integer">${empty pagesize ? 10 :
pagesize}</mm:import>
+ <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:listnodescontainer type="${type}" id="repository">
<jsp:doBody />
<mm:sortorder field="number" direction="down" />
</mm:listnodescontainer>
<jsp:directive.include file="/mmbase/searchrelate/settings.jspf" />
<mm-sr:relate
+ forms="${_forms}"
repository="${repository}"
load="${load}"
pagesize="${_pagesize}"
Modified:
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/List.js.jsp
===================================================================
---
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/List.js.jsp
2010-04-03 15:24:19 UTC (rev 41763)
+++
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/List.js.jsp
2010-04-06 08:37:00 UTC (rev 41764)
@@ -53,6 +53,15 @@
list.relate(e, number);
});
+
+ $("div.lazy").
+ live("mmsr_lazyloaded",
+ function(e) {
+ var div = e.target;
+ // switch on mm-sr stuf in this newly loaded block too
+ List.prototype.init(this);
+ }
+ );
}
);
Modified:
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/PathSearcher.js.jsp
===================================================================
---
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/PathSearcher.js.jsp
2010-04-03 15:24:19 UTC (rev 41763)
+++
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/PathSearcher.js.jsp
2010-04-06 08:37:00 UTC (rev 41764)
@@ -15,13 +15,18 @@
$(document).ready(
function() {
- $("table.mmsr_pathsearch").each(
- function() {
- this.pathSearcher = new MMBasePathSearcher(this);
- });
+ MMBasePathSearcher.prototype.init($("body")[0]);
}
);
+$("div.lazy").
+ live("mmsr_lazyloaded",
+ function(e) {
+ var div = e.target;
+ MMBasePathSearcher.prototype.init(this);
+ }
+ );
+
$("div.mm_related.pathsearcher_ontheway").
live("mmsrRelate",
function (e, tr, relater) {
@@ -70,7 +75,14 @@
}
-
+MMBasePathSearcher.prototype.init = function(el) {
+ $(el).find("table.mmsr_pathsearch").each(
+ function() {
+ if (this.pathSearch == null) {
+ this.pathSearcher = new MMBasePathSearcher(this);
+ }
+ });
+}
/*
</fmt:bundle>
</mm:content>
Modified:
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/Toggle.js.jsp
===================================================================
---
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/Toggle.js.jsp
2010-04-03 15:24:19 UTC (rev 41763)
+++
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/Toggle.js.jsp
2010-04-06 08:37:00 UTC (rev 41764)
@@ -50,8 +50,7 @@
},
function(responseText, textStatus) {
if ("success"
== textStatus) {
- // switch
on mm-sr stuf in this newly loaded block too
-
List.prototype.init(this);
+
$(this).trigger("mmsr_lazyloaded", []);
} else {
// well,
it doesn't work.
// Show
at least that.
Modified:
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/list/lazy-part.jspx
===================================================================
---
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/list/lazy-part.jspx
2010-04-03 15:24:19 UTC (rev 41763)
+++
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/list/lazy-part.jspx
2010-04-06 08:37:00 UTC (rev 41764)
@@ -28,6 +28,7 @@
page="${href}"
referids="rid">
<mm:param
name="org.mmbase.sr.relatednodes.load">false</mm:param>
+ <mm:param name="org.mmbase.in_form">true</mm:param>
</mm:include>
</mm:node>
</mm:form>
@@ -43,7 +44,7 @@
page="${href}"
referids="rid">
<mm:param
name="org.mmbase.sr.relatednodes.load">false</mm:param>
-
+ <mm:param name="org.mmbase.in_form">true</mm:param>
</mm:include>
</mm:node>
<mm:cancel />
Copied:
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/path/javascript.jspf
(from rev 41708,
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/webapp/mmbase/searchrelate/path/javascript.jspf)
===================================================================
---
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/path/javascript.jspf
(rev 0)
+++
mmbase/trunk/applications/searchrelate/src/main/webapp/mmbase/searchrelate/path/javascript.jspf
2010-04-06 08:37:00 UTC (rev 41764)
@@ -0,0 +1,8 @@
+<jsp:root
+ xmlns:jsp="http://java.sun.com/JSP/Page";
+ xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
+ version="2.0">
+
+ <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:root>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
