Changeset 3245

Timestamp:

01/07/08 20:42:48 (5 years ago)

Author:

moschny

Message:

• Add noreorder argument, fixes #277.
• Code simplifications.
• Increase version number.

Location:

trac/plugins/tracnav-0.11/tracnav

Files:

• __init__.py (modified) (1 diff)
• tracnav.py (modified) (3 diffs)

trac/plugins/tracnav-0.11/tracnav/__init__.py

@@ -1 @@
-__version__ = '4.0pre5'
+__version__ = '4.0pre6'

trac/plugins/tracnav-0.11/tracnav/tracnav.py

@@ -126 +126 @@
         self.names = []
         self.collapse = True
+        self.reorder = True
         if args:
             for arg in map(lambda a: a.strip(), args.split('|')):
@@ -132 +133 @@
                 elif arg == 'noedit':
                     self.modify = False
+                elif arg == 'noreorder':
+                    self.reorder = False
                 else:
                     self.names.append(arg)
@@ -245 +248 @@
         for name, title, sub in toc:
             if sub == None:
-                if name == self.curpage:
-                    found = True
+                found |= name == self.curpage
                 result.append((name, title, None))
             else:
                 subfound, subtoc = self.filter_toc(sub, level + 1)
-                if subfound:
-                    found = True
+                found |= subfound
                 if subfound or (name == None):
-                    if level == 0 and name != None:
-                        prepended = [(name, title, subtoc)]
-                        prepended.extend(result)
-                        result = prepended
+                    if level == 0 and name != None and self.reorder:
+                        result.insert(0, (name, title, subtoc))
                     else:
                         result.append((name, title, subtoc))