Changeset 12528

Timestamp:

02/19/08 14:17:03 (11 months ago)

Author:

pottedmeat

Message:

Refs #5602. Make sure all inheritance chain is themed and ignore type object if we can't find a type

Files:

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

util/branches/dev/jsdoc/jsdoc.module

@@ -2870 +2870 @@
           if ($children[$title]) {
             $found = false;
-            foreach ($children[$title]->inheritance as $parent) {
-              if ($parent->title == $mixin->title) {
-                $found = true;
-                break;
+            if ($children[$title]->inheritance) {
+              foreach ($children[$title]->inheritance as $parent) {
+                if ($parent->title == $mixin->title) {
+                  $found = true;
+                  break;
+                }
               }
             }
@@ -2891 +2893 @@
             $children[$title] = _jsdoc_get_object_themed($item, $title);
             if ($mixin->title != $node->title) {
-              $children[$title]->inheritance[] = (object)array(
-                'title' => $mixin->title,
-                'summary' => jsdoc_get_teaser($mixin),
-                'url' => $mixin->jsdoc_url
-              );
+              $children[$title]->inheritance[] = _jsdoc_get_object_themed($mixin);
             }
           }
@@ -2911 +2909 @@
     }
   }
+  print_r($children);
   uksort($children, "strnatcasecmp");
 
@@ -2967 +2966 @@
   $object = (object)array(
     'title' => $title,
-    'type' => (object)array(
-      'title' => '',
-      'url' => '',
-      'a' => ''
-    ),
     'url' => $node->jsdoc_url,
     'summary' => jsdoc_get_teaser($node),
@@ -2984 +2978 @@
   }
 
-  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;
+  if ($type = jsdoc_get_type($node)) {
+    $type = jsdoc_object_node_load($type, jsdoc_get_project($node), jsdoc_get_version($node), jsdoc_get_all_provide_nids($node, array(3, 4)));
+    $object->type = (object)array(
+      'title' => $type->title,
+      'url' => $type->jsdoc_url
+    );
     if ($type->jsdoc_url) {
       $object->type->a = l($type->title, $type->jsdoc_url);