Changeset 12522

Timestamp:

02/19/08 13:12:37 (11 months ago)

Author:

pottedmeat

Message:

Refs #5602. Make sure variables and objects get the same object format

Files:

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

util/branches/dev/jsdoc/jsdoc.module

@@ -2710 +2710 @@
   $form['body']['#value'] .= jsdoc_get_body($node);
 
-  if (jsdoc_get_type($node) == 'Function' || jsdoc_get_type($node) == 'Class') {
-    $resources = jsdoc_get_variable_resources($node);
-
-    $display_resources = array();
-    foreach ($resources as $resource_value) {
-      $display_resources[] = (object)array(
-        'href' => l($resource_value->title, 'jsdoc/' . jsdoc_get_project($node)->title . '/HEAD/' . str_replace('/', '__', $resource_value->title) . '/' . $node->title)
-      );
-    }
-    $form['jsdoc_resources'] = array(
-      '#value' => theme('jsdoc_object_resources', $node, $display_resources),
-      '#weight' => 10
+  $resources = jsdoc_get_variable_resources($node);
+
+  $display_resources = array();
+  foreach ($resources as $resource_value) {
+    $display_resources[] = (object)array(
+      'href' => l($resource_value->title, 'jsdoc/' . jsdoc_get_project($node)->title . '/HEAD/' . str_replace('/', '__', $resource_value->title) . '/' . $node->title)
     );
   }
+  $form['jsdoc_resources'] = array(
+    '#value' => theme('jsdoc_object_resources', $node, $display_resources),
+    '#weight' => 10
+  );
 
   $children = array();
@@ -2730 +2728 @@
     uksort($variables, "strnatcasecmp");
     foreach ($variables as $child) {
-      $children[] = (object)array(
-        'title' => $child->title,
-        'url' => $child->jsdoc_url,
-        'summary' => jsdoc_get_teaser($child)
-      );
+      $children[] = _jsdoc_get_object_themed($child);
     }
     $form['children'] = array(
@@ -2896 +2890 @@
           }
           else {
-            $children[$title] = (object)array(
-              'title' => $title,
-              'type' => (object)array(
-                'title' => jsdoc_get_type($item),
-                'url' => jsdoc_object_node_load(jsdoc_get_type($item), jsdoc_get_project($node), jsdoc_get_version($node), jsdoc_get_all_provide_nids($node, array(3, 4)))->jsdoc_url
-              ),
-              'singleton' => jsdoc_is_initialized($item),
-              'inheritance' => array()
-            );
+            $children[$title] = _jsdoc_get_object_themed($item, $title);
             if ($mixin->title != $node->title) {
               $children[$title]->inheritance[] = (object)array(
@@ -2972 +2958 @@
   }
   drupal_goto('node/' . $node->nid . '/edit');
+}
+
+function _jsdoc_get_object_themed($node, $title=null) {
+  if (is_null($title)) {
+    $title = $node->title;
+  }
+
+  return (object)array(
+    'title' => $title,
+    'type' => (object)array(
+      'title' => jsdoc_get_type($node),
+      'url' => 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)))->jsdoc_url
+    ),
+    'summary' => jsdoc_get_teaser($node),
+    'singleton' => jsdoc_is_initialized($node),
+    'inheritance' => array()
+  );
 }