Changeset 12599

Timestamp:

02/21/08 13:49:17 (11 months ago)

Author:

pottedmeat

Message:

Refs #5602. Add theme functions for summary and description

Files:

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

util/branches/dev/jsdoc/jsdoc.module

@@ -2196 +2196 @@
  */
 function jsdoc_variable_node_view($node) {
-  $node = node_prepare($node);
-
-  $form = $node->content;
-
-  if (jsdoc_get_teaser($node)) {
-    $form['body']['#value'] = jsdoc_get_teaser($node);
-    if (jsdoc_get_body($node)) {
-      $form['body']['#value'] .= '\n\n';
-    }
-  }
-  $form['body']['#value'] .= jsdoc_get_body($node);
+  $form = _jsdoc_node_prepare($node);
 
   $resources = jsdoc_get_variable_resources($node);
@@ -2255 +2245 @@
   drupal_set_title(theme('jsdoc_object_title', _jsdoc_get_title_themed($node)));
 
-  $form = node_prepare($node, false)->content;
+  $form = _jsdoc_node_prepare($node);
 
   $form['require'] = array(
@@ -2264 +2254 @@
   $form['resource'] = array(
     '#value' => theme('jsdoc_object_resource', jsdoc_get_resource($node))
-  );
-
-  $form['body'] = array(
-    '#value' => $node->teaser . $node->body,
-    '#weight' => 0
   );
 
@@ -3358 +3343 @@
 }
 
+function _jsdoc_node_prepare($node) {
+  $form = node_prepare($node)->content;
+  $form['summary'] = node_prepare($node, true)->content['body'];
+  --$form['summary']['#weight'];
+
+  $form['summary']['#value'] = theme('jsdoc_object_summary', $teaser);
+  $form['description']['#value'] = theme('jsdoc_object_description', $teaser, $form['body']['#value']);
+  unset($form['body']);
+
+  return $form;
+}
+
 function _jsdoc_node_load($param = array(), $revision = NULL, $reset = NULL) {
   static $nodes;
@@ -3771 +3768 @@
   return $output;
 }
+
+function theme_jsdoc_object_summary($summary) {
+  return '';
+}
+
+function theme_jsdoc_object_description($summary, $description) {
+  return $summary . $description;
+}