From 42d5e45576b519f19879d2b0eba529932da81644 Mon Sep 17 00:00:00 2001
From: Koosha KM <koosha.khajeh@gmail.com>
Date: Tue, 14 Oct 2014 20:42:46 +0000
Subject: Bug 1059723: Reply button should become AJAX-based r=dkl,a=sgreen

---
 Bugzilla/Markdown.pm | 32 +++++++++++++++++++++++++++++++-
 Bugzilla/Template.pm | 12 +++++++-----
 2 files changed, 38 insertions(+), 6 deletions(-)

(limited to 'Bugzilla')

diff --git a/Bugzilla/Markdown.pm b/Bugzilla/Markdown.pm
index 5f1a7d955..3023d98e2 100644
--- a/Bugzilla/Markdown.pm
+++ b/Bugzilla/Markdown.pm
@@ -75,7 +75,7 @@ sub _Markdown {
     my $self = shift;
     my $text = shift;
 
-    $text = Bugzilla::Template::quoteUrls($text);
+    $text = Bugzilla::Template::quoteUrls($text, undef, undef, undef, undef, 1);
 
     return $self->SUPER::_Markdown($text, @_);
 }
@@ -392,6 +392,36 @@ sub _DoCodeBlocks {
     return $text;
 }
 
+sub _DoBlockQuotes {
+    my ($self, $text) = @_;
+
+    $text =~ s{
+          (                             # Wrap whole match in $1
+            (?:
+              ^[ \t]*&gt;[ \t]?         # '>' at the start of a line
+                .+\n                    # rest of the first line
+              (?:.+\n)*                 # subsequent consecutive lines
+              \n*                       # blanks
+            )+
+          )
+        }{
+            my $bq = $1;
+            $bq =~ s/^[ \t]*&gt;[ \t]?//gm; # trim one level of quoting
+            $bq =~ s/^[ \t]+$//mg;          # trim whitespace-only lines
+            $bq = $self->_RunBlockGamut($bq, {wrap_in_p_tags => 1});      # recurse
+            $bq =~ s/^/  /mg;
+            # These leading spaces screw with <pre> content, so we need to fix that:
+            $bq =~ s{(\s*<pre>.+?</pre>)}{
+                        my $pre = $1;
+                        $pre =~ s/^  //mg;
+                        $pre;
+                    }egs;
+            "<blockquote>\n$bq\n</blockquote>\n\n";
+        }egmx;
+
+    return $text;
+}
+
 sub _EncodeCode {
     my ($self, $text) = @_;
 
diff --git a/Bugzilla/Template.pm b/Bugzilla/Template.pm
index ca467577f..660767afd 100644
--- a/Bugzilla/Template.pm
+++ b/Bugzilla/Template.pm
@@ -148,10 +148,11 @@ sub get_format {
 # If you want to modify this routine, read the comments carefully
 
 sub quoteUrls {
-    my ($text, $bug, $comment, $user, $bug_link_func) = @_;
+    my ($text, $bug, $comment, $user, $bug_link_func, $for_markdown) = @_;
     return $text unless $text;
     $user ||= Bugzilla->user;
     $bug_link_func ||= \&get_bug_link;
+    $for_markdown ||= 0;
 
     # We use /g for speed, but uris can have other things inside them
     # (http://foo/bug#3 for example). Filtering that out filters valid
@@ -222,10 +223,11 @@ sub quoteUrls {
 
     $text = html_quote($text);
 
-    # Color quoted text
-    $text =~ s~^(&gt;.+)$~<span class="quote">$1</span >~mg;
-    $text =~ s~</span >\n<span class="quote">~\n~g;
-
+    unless ($for_markdown) {
+        # Color quoted text
+        $text =~ s~^(&gt;.+)$~<span class="quote">$1</span >~mg;
+        $text =~ s~</span >\n<span class="quote">~\n~g;
+    }
     # mailto:
     # Use |<nothing> so that $1 is defined regardless
     # &#64; is the encoded '@' character.
-- 
cgit v1.2.3-24-g4f1b