From cd6eb836f6ca73c7aa17ddfd65beb062c82836fe Mon Sep 17 00:00:00 2001
From: Hua Wang <hwang36@gmail.com>
Date: Wed, 31 Aug 2011 23:18:38 -0700
Subject: [PATCH] Enable comments for image

Summary: Added line number 1 for each image and added code to display the
comments for each image.

Test Plan: Adding an image in my local directory and create a revision for it.
Click line number 1, and the comment window prompts.  Adding and save the
comment. The comment shows in the differential comment list and in the inline
comment.  Submit the comment.  Create more comments for the image and the
"Previous" and "Next" buttons all work well.

Reviewers: epriestley, jungejason

CC:

Differential Revision: 901
---
 .../changeset/DifferentialChangesetParser.php | 50 +++++++++++++++++--
 1 file changed, 47 insertions(+), 3 deletions(-)

diff --git a/src/applications/differential/parser/changeset/DifferentialChangesetParser.php b/src/applications/differential/parser/changeset/DifferentialChangesetParser.php
index fe0878b8c9..b8ace11c4d 100644
--- a/src/applications/differential/parser/changeset/DifferentialChangesetParser.php
+++ b/src/applications/differential/parser/changeset/DifferentialChangesetParser.php
@@ -899,22 +899,66 @@ class DifferentialChangesetParser {
           }
         }
 
+        $this->comments = msort($this->comments, 'getID');
+        $old_comments = array();
+        $new_comments = array();
+        foreach ($this->comments as $comment) {
+          if ($this->isCommentOnRightSideWhenDisplayed($comment)) {
+            $new_comments[] = $comment;
+          } else {
+            $old_comments[] = $comment;
+          }
+        }
+
+        $html_old = array();
+        $html_new = array();
+        foreach ($old_comments as $comment) {
+          $xhp = $this->renderInlineComment($comment);
+          $html_old[] =
+            '<tr class="inline"><th /><td>'.
+              $xhp.
+            '</td><th /><td /></tr>';
+        }
+        foreach ($new_comments as $comment) {
+          $xhp = $this->renderInlineComment($comment);
+          $html_new[] =
+            '<tr class="inline"><th /><td /><th /><td>'.
+              $xhp.
+            '</td></tr>';
+        }
+
+        $changset_id = $this->changeset->getID();
+        if (!$old) {
+          $th_old = '<th></th>';
+        }
+        else {
+          $th_old = '<th id="C'.$changset_id.'OL1">1</th>';
+        }
+        if (!$cur) {
+          $th_new = '<th></th>';
+        }
+        else {
+          $th_new = '<th id="C'.$changset_id.'NL1">1</th>';
+        }
+
         $output = $this->renderChangesetTable(
           $this->changeset,
           '<tr>'.
-            '<th></th>'.
+            $th_old.
             '<td class="differential-old-image">'.
               '<div class="differential-image-stage">'.
                 $old.
               '</div>'.
             '</td>'.
-            '<th></th>'.
+            $th_new.
             '<td class="differential-new-image">'.
               '<div class="differential-image-stage">'.
                 $cur.
               '</div>'.
             '</td>'.
-          '</tr>');
+          '</tr>'.
+          implode('', $html_old).
+          implode('', $html_new));
 
         return $output;
       case DifferentialChangeType::FILE_DIRECTORY: