Changeset 12526

Timestamp:

02/19/08 13:55:55 (11 months ago)

Author:

pottedmeat

Message:

Refs #5602. Make sure the URL references the last item inherited

Files:

• util/branches/dev/jsdoc/jsdoc.module (modified) (5 diffs)

util/branches/dev/jsdoc/jsdoc.module

@@ -2881 +2881 @@
               }
               else {
-                $children[$title]->inheritance[] = (object)array(
-                  'title' => $mixin->title,
-                  'summary' => jsdoc_get_teaser($mixin),
-                  'url' => $mixin->jsdoc_url
-                );
+                $inherited = _jsdoc_get_object_themed($item, $title);
+                $children[$title]->url = $inherited->url;
+                $children[$title]->a = $inherited->a;
+                $children[$title]->inheritance[] = _jsdoc_get_object_themed($mixin);
               }
             }
@@ -2912 +2911 @@
     }
   }
-  print_r($children);
   uksort($children, "strnatcasecmp");
 
@@ -2975 +2973 @@
     ),
     'url' => $node->jsdoc_url,
-    'a' => l($node->title, $node->jsdoc_url),
     'summary' => jsdoc_get_teaser($node),
     'singleton' => jsdoc_is_initialized($node),
@@ -2981 +2978 @@
   );
 
+  if ($object->url) {
+    $object->a = l($node->title, $node->jsdoc_url);
+  }
+  else {
+    $object->a = $object->title;
+  }
+
   if ($type = jsdoc_object_node_load(jsdoc_get_type($node), jsdoc_get_project($node), jsdoc_get_version($node), jsdoc_get_all_provide_nids($node, array(3, 4)))) {
     $object->type->title = $type->title;
     $object->type->url = $type->jsdoc_url;
-    $object->type->a = l($type->title, $type->jsdoc_url);
+    if ($type->jsdoc_url) {
+      $object->type->a = l($type->title, $type->jsdoc_url);
+    }
+    else {
+      $object->type->a = $type->title;
+    }
   }
 
@@ -4074 +4083 @@
     $output .= '<div class="form-item">';
     if ($child->type) {
-      if ($child->type->url) {
-        $output .= '<em>' . l($child->type->title, $child->type->url) . '</em> ';
-      }
-      else {
-        $output .= '<em>' . $child->type->title . '</em> ';
-      }
+      $output .= '<em>' . $child->type->a . '</em> ';
     }
     $output .= l($child->title, $child->url);