[MMBASE SCM] r41701 - in mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/webapp/mmbase/searchrelate: . path

[michiel]

Author: michiel
Date: 2010-03-31 14:05:19 +0200 (Wed, 31 Mar 2010)
New Revision: 41701

Added:
   
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/webapp/mmbase/searchrelate/path/javascript.jspf
Modified:
   
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/webapp/mmbase/searchrelate/List.js.jsp
   
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/webapp/mmbase/searchrelate/PathSearcher.js.jsp
   
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/webapp/mmbase/searchrelate/Toggle.js.jsp
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/webapp/mmbase/searchrelate/List.js.jsp
===================================================================
--- 
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/webapp/mmbase/searchrelate/List.js.jsp
        2010-03-31 11:21:24 UTC (rev 41700)
+++ 
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/webapp/mmbase/searchrelate/List.js.jsp
        2010-03-31 12:05:19 UTC (rev 41701)
@@ -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/branches/MMBase-1_9/applications/searchrelate/src/main/webapp/mmbase/searchrelate/PathSearcher.js.jsp
===================================================================
--- 
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/webapp/mmbase/searchrelate/PathSearcher.js.jsp
        2010-03-31 11:21:24 UTC (rev 41700)
+++ 
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/webapp/mmbase/searchrelate/PathSearcher.js.jsp
        2010-03-31 12:05:19 UTC (rev 41701)
@@ -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/branches/MMBase-1_9/applications/searchrelate/src/main/webapp/mmbase/searchrelate/Toggle.js.jsp
===================================================================
--- 
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/webapp/mmbase/searchrelate/Toggle.js.jsp
      2010-03-31 11:21:24 UTC (rev 41700)
+++ 
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/webapp/mmbase/searchrelate/Toggle.js.jsp
      2010-03-31 12:05:19 UTC (rev 41701)
@@ -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.

Added: 
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/webapp/mmbase/searchrelate/path/javascript.jspf
===================================================================
--- 
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/webapp/mmbase/searchrelate/path/javascript.jspf
                               (rev 0)
+++ 
mmbase/branches/MMBase-1_9/applications/searchrelate/src/main/webapp/mmbase/searchrelate/path/javascript.jspf
       2010-03-31 12:05:19 UTC (rev 41701)
@@ -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>&lt;!-- 
--&gt;</jsp:text></script>
+  <mm:write request="mm_pathsearch_javascript" value="yes" />
+</jsp:root>

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs