? javascript-and-nodecomment.patch
? quote.js
Index: quote.admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/quote/Attic/quote.admin.inc,v
retrieving revision 1.1.2.2
diff -u -p -r1.1.2.2 quote.admin.inc
--- quote.admin.inc	13 May 2008 06:20:53 -0000	1.1.2.2
+++ quote.admin.inc	20 Jun 2009 00:08:34 -0000
@@ -51,6 +51,13 @@ function quote_settings_form() {
     '#default_value' => _quote_variable_get('subject_required')
   );
 
+  $form['quote']['use_javascript'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Use javascript'),
+    '#description' => t('If enabled, javascript will be used for quoting to provide a better user experience.'),
+    '#default_value' => _quote_variable_get('use_javascript')
+  );
+
   return system_settings_form($form);
 }
 
Index: quote.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/quote/quote.module,v
retrieving revision 1.29.2.10.2.9
diff -u -p -r1.29.2.10.2.9 quote.module
--- quote.module	24 Feb 2009 15:00:50 -0000	1.29.2.10.2.9
+++ quote.module	20 Jun 2009 00:08:34 -0000
@@ -53,29 +53,74 @@ function quote_init() {
 function quote_link($type, $post, $teaser = FALSE) {
   $links = array();
 
-  if (user_access('post comments')) {
+  $comment_type = '';
+  $can_quote = FALSE;
+
+  if ($type == 'node') {
+    // Check to see if this is a nodecomment on a node.
+    if (isset($post->comment_target_nid)) {
+      $parent_node = node_load($post->comment_target_nid);
+    }
+    else {
+      $parent_node = $post;
+    }
+
+    // See what the comment type on this node is.
+    $comment_type = module_invoke('nodecomment', 'get_comment_type', $parent_node->type);
+    if (!$comment_type) {
+      $can_quote = user_access('post comments') && $parent_node->comment == COMMENT_NODE_READ_WRITE;
+      $href = "comment/reply/$post->nid";
+      $textarea = '#edit-comment';
+    }
+    else {
+      $can_quote = user_access("create $comment_type content") && $parent_node->node_comment == COMMENT_NODE_READ_WRITE;
+      $href = "node/add/". str_replace('_', '-', $comment_type) ."/$parent_node->nid";
+      if ($post != $parent_node) {
+        $href .= "/$post->nid";
+      }
+      $textarea = '#edit-body';
+    }
+
+    // Get an unadulterated version so we can use the unfiltered node here.
+    $node = node_load($post->nid);
+    $author = $node->name;
+    $body = $node->body;
+    $id = 'quote-link-node-' . $post->nid;
+  }
+  else if ($type == 'comment') {
+    $parent_node = node_load($post->nid);
+    $can_quote = user_access('post comments') && $parent_node->comment == COMMENT_NODE_READ_WRITE;
+    $href = "comment/reply/$post->nid/$post->cid";
+    $author = $post->name;
+    $body = $post->comment;
+    $id = 'quote-link-comment-' . $post->cid;
+    $textarea = '#edit-comment';
+  }
+
+  if ($type == 'node' && $parent_node->nid == $post->nid) {
+    if (!_quote_variable_get('node_link_display')) {
+      $can_quote = FALSE;
+    }
+  }
+
+  if ($can_quote && in_array($parent_node->type, _quote_variable_get('node_types'))) {
     $link = array(
-      'title' => t('Quote'),
-      'attributes' => array('title' => t('Quote this post in your reply.')),
+      'title' => $parent_node == $post ? t('Quote') : t('quote'),
+      'href' => $href,
+      'attributes' => array('title' => t('Quote this post in your reply.'), 'class' => 'quote-link', 'id' => $id),
       'query' => 'quote=1',
       'fragment' => 'comment-form'
     );
-    // $post can be either a node or a comment.
-    if ($type == 'comment') {
-      // Display quote link for comments only if the parent node is accepting
-      // comments and has the quote filter enabled.
-      $node = menu_get_object();
-      if (in_array($node->type, _quote_variable_get('node_types')) && $node->comment == COMMENT_NODE_READ_WRITE) {
-        $link['href'] = "comment/reply/$post->nid/$post->cid";
-        $link['title'] = t('quote');
-        $links['quote'] = $link;
-      }
-    }
-    elseif ($type == 'node' && in_array($post->type, _quote_variable_get('node_types')) && $post->comment == COMMENT_NODE_READ_WRITE && _quote_variable_get('node_link_display')) {
-      // Display quote link for nodes only if the node is accepting comments,
-      // has the quote filter enabled and has quote_link_display set.
-      $link['href'] = "comment/reply/$post->nid";
-      $links['quote'] = $link;
+    $links['quote'] = $link;
+
+    if (_quote_variable_get('use_javascript')) {
+      $script = '$(function() {';
+      $script .= '  jQuery.data($("#'. $id .'").get(0), "quote-author", '. drupal_to_js($author) .');' . "\n";
+      $script .= '  jQuery.data($("#'. $id .'").get(0), "quote-body", '. drupal_to_js($body) .');' . "\n";
+      $script .= '  jQuery.data($("#'. $id .'").get(0), "quote-textarea", '. drupal_to_js($textarea) .');' . "\n";
+      $script .= "});";
+      drupal_add_js($script, 'inline', 'footer');
+      drupal_add_js(drupal_get_path('module', 'quote') .'/quote.js');
     }
   }
 
@@ -121,6 +166,28 @@ function quote_form_alter(&$form, &$form
       $form['subject']['#required'] = TRUE;
     }
   }
+
+  if (!empty($_GET['quote']) && isset($form['type']) && isset($form['type']['#value'])) {
+    if ($form['type']['#value'] .'_node_form' == $form_id) {
+      $node = &$form['#node'];
+      $nid = arg(3);
+      $cid = arg(4);
+
+      if ($cid) {
+        $parent = node_load($cid);
+      }
+      elseif ($nid && _quote_variable_get('node_link_display')) {
+        $parent = node_load($nid);
+      }
+
+      if ($parent) {
+        $quote = $parent->body;
+        $author = !empty($parent->name) ? $parent->name : variable_get('anonymous', 'Anonymous');
+        // Add quoted text and preserve existing content (signature etc.).
+        $form['body_field']['body']['#default_value'] = '[quote='. $author .']'. trim($quote) ."[/quote]\n". $form['body_field']['body']['#default_value'];
+      }
+    }
+  }
 }
 
 /**
@@ -196,7 +263,8 @@ function _quote_variable_get($name = NUL
     $defaults = array(
       'node_types' => array('blog', 'story'),
       'node_link_display' => 1,
-      'subject_required' => 1
+      'subject_required' => 1,
+      'use_javascript' => 1,
     );
     $variables = variable_get('quote', array());
     $variables = array_merge($defaults, $variables);