Changeset 2724

Timestamp:

02/21/05 09:32:45 (8 years ago)

Author:

hauma

Message:

• Refactoring: Break generate() into filter() and display(). This separates filtering the TOC structure according to the currently displayed page and displaying the result.
• Display the unfiltered version of the TOC structure, if the current page is not found.

File:

• trac/trunk/wiki-macros/JPNav.py (modified) (2 diffs)

trac/trunk/wiki-macros/JPNav.py

@@ -98 +98 @@
     if (hdf.getValue('trac.acl.WIKI_MODIFY', '')):
         html += '<div class="wiki-tocedit"><a href="%s?edit=yes">edit</a></div>' % env.href.wiki(name)
-    (_, subhtml) = generate(env, curpage, toc, 0)
-    html += subhtml
+    (found, filtered) = filter(curpage, toc, 0)
+    if found:
+        html += display(env, curpage, filtered)
+    else:
+        html += display(env, curpage, toc)
     html += '</div>'
-    return html;
+    return html
 
 
-def generate(env, curpage, toc, level):
-    html = ''
+def filter(curpage, toc, level):
     found = 0
+    result = []
+    for name, title, sub in toc:
+        if sub == None:
+            if name == curpage:
+                found = 1
+            result.append((name, title, None))
+        else:
+            (subfound, subtoc) = filter(curpage, sub, level + 1)
+            if subfound or (name == None):
+                found = 1
+                if level == 0 and name != None:
+                    prepended = [(name, title, subtoc)]
+                    prepended.extend(result)
+                    result = prepended
+                else:
+                    result.append((name, title, subtoc))
+            else:
+                result.append((name, title, []))
+    return (found, result)
+
+
+def display(env, curpage, toc):
+    html = '<ul>'
     for name, title, sub in toc:
         if sub == None:
             if name == curpage:
                 cls = ' class="active"'
-                found = 1
             else:
                 cls = ''
@@ -121 +145 @@
             html += '</li>'
         else:
-            (subfound, subhtml) = generate(env, curpage, sub, level + 1)
-            if subfound or (name == None):
-                menu = ''
-                menu += '<li>'
-                menu += '<h4>%s</h4>' % title
-                menu += subhtml
-                menu += '</li>'
-                found = 1
-                if level == 0 and name != None:
-                    html = menu + html
-                else:
-                    html += menu
+            html += '<li>'
+            if name == None:
+                html += '<h4>%s</h4>' % title
             else:
-                html += '<li>'
                 html += '<h4><a href="%s">%s...</a></h4>' % (env.href.wiki(name), title)
-                html += '</li>'
-    html = '<ul>%s</ul>' % html
-    return (found, html);
+            html += display(env, curpage, sub)
+            html += '</li>'
+    html += '</ul>'
+    return html