Changeset 12569

Timestamp:

02/20/08 15:02:44 (11 months ago)

Author:

pottedmeat

Message:

Refs #5602. Clean up the title theme function

Files:

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

util/branches/dev/jsdoc/jsdoc.module

@@ -2234 +2234 @@
   }
 
-  drupal_set_title(theme('jsdoc_object_title', $node));
+  drupal_set_title(theme('jsdoc_object_title', _jsdoc_get_title_themed($node)));
 
   return drupal_render_form('jsdoc_variable_form', $form);
@@ -2253 +2253 @@
   drupal_add_js('misc/collapse.js');
 
-  drupal_set_title(theme('jsdoc_object_title', $node));
+  drupal_set_title(theme('jsdoc_object_title', _jsdoc_get_title_themed($node)));
 
   $form = node_prepare($node, false)->content;
@@ -2438 +2438 @@
 }
 
+function _jsdoc_get_title_themed($node) {
+  $themed = (object)array(
+    'title' => $node->title,
+    'crumbs' => array()
+  );
+
+  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)));
+    $themed->type = (object)array(
+      'title' => $type->title,
+      'url' => $type->jsdoc_url
+    );
+    if ($type->jsdoc_url) {
+      $themed->type->a = l($type->title, $type->jsdoc_url);
+    }
+    else {
+      $themed->type->a = $type->title;
+    }
+  }
+
+  $parts = explode('.', $node->title);
+  $title_text = "";
+  $end = array_pop($parts);
+  foreach ($parts as $part) {
+    if (!empty($title_text)) {
+      $title_text .= '.';
+    }
+    $title_text .= $part;
+
+    $obj = jsdoc_object_node_load($title_text, jsdoc_get_project($node), jsdoc_get_version($node));
+    if ($obj) {
+      $themed->crumbs[] = l($part, $obj->jsdoc_url);
+    }
+    else {
+      $themed->crumbs[] = $part;
+    }
+  }
+  $themed->crumbs[] = $end;
+
+  return $themed;  
+}
+
 function _jsdoc_get_object_themed($node, $title=null) {
   if (is_null($title)) {
@@ -3054 +3096 @@
   }
 
-  $signature = 'function (';
+  $signature = '(';
 
   if ($parameters) {
@@ -3501 +3543 @@
  * Theme the object type block.
  */
-function theme_jsdoc_object_title($node) {
-  $parts = explode('.', $node->title);
-  $title_text = "";
-  $end = array_pop($parts);
-  $title = "";
-  $last_part = "";
-  foreach ($parts as $part) {
-    if (!empty($title_text)) {
-      $title_text .= '.';
-    }
-    $title_text .= $part;
-
-    $obj = jsdoc_object_node_load($title_text, jsdoc_get_project($node), jsdoc_get_version($node));
-    if (!empty($title)) {
-      $title .= '.';
-    }
-    if ($obj) {
-      $title .= l($part, $obj->jsdoc_url);
-    }
-    else {
-      $title .= $part;
-    }
-  }
-  if (!empty($title)) {
-    $title .= '.';
-  }
-
-  $title .= $end;
-
-  /*
-  if (jsdoc_get_type($node)) {
-    $type_node = jsdoc_object_node_load(jsdoc_get_type($node), jsdoc_get_project($node), jsdoc_get_version($node));
-    if ($type_node) {
-      $title .= ': ' . l(jsdoc_get_type($node), $type_node->jsdoc_url);
-    }
-  }
-  */
-  
-  return $title;
+function theme_jsdoc_object_title($title) {
+  $output = implode('.', $title->crumbs);
+  if ($title->type) {
+    $output .= ': ' . $title->type->a;
+  }
+  return $output;
 }
 
@@ -3589 +3598 @@
   $output .= '<div class="fieldset-wrapper">';
 
-  $statics = array();
-  $functions = array();
-  $constructors = array();
-  $objects = array();
   foreach($children as $child){
+    
     if($child->type){
       if($child->type->title=="Constructor") $constructors[]=$child;
@@ -3603 +3609 @@
     }
   }
-  
+
   $types = array("Statics"=>$statics, "Constructors"=>$constructors, "Properties"=>$objects, "Functions"=>$functions);
   foreach($types as $key=>$arr){
@@ -3614 +3620 @@
         $output .= ': <small>' . $child->type->a . '</small> ';
       }
-      if($child->parameters){
-                  $output .= '(';
-                  foreach ($child->parameters as $i => $param){
-                        if($i){
-                          $output .= ', ';
-                        }
-                    if($param->types){
-                          $output .= '/* ';
-                          foreach ($param->types as $j => $type){
-                                if($j) {
-                                  $output .= '|';
-                                }
-                                $output .= $type->a ;
-                          }
-                          if($param->repeating){
-                                $output .= '...';
-                          }
-                          if($param->optional){
-                                $output .= '?';
-                          }
-                          $output .= ' */ ';
-                        }
-                        $output .= $param->name;
-          }
-                  $output .= ') ';
+      if($child->signature){
+        $output .= $child->signature;
       }
           else if($key=="Functions"){
@@ -3705 +3688 @@
   $output .= '<div class="fieldset-wrapper">';
   $output .= '<div class="form-item">';
-  $output .= $function->signature;
+  $output .= 'function ' . $function->signature;
   $output .= '</div>';
   $output .= '</div>';