From b5b37a116888ee53a97bf3e16d20103da30cd7c6 Mon Sep 17 00:00:00 2001
From: Naoki Takezoe <takezoe@gmail.com>
Date: Sun, 24 Jun 2018 01:01:55 +0900
Subject: [PATCH] (refs #2049)Fix comment top diff handling

---
 .../twirl/gitbucket/core/helper/diff.scala.html | 17 +++++++++--------
 .../gitbucket/core/repo/commentform.scala.html  | 14 ++++++++++++--
 src/main/webapp/assets/common/js/gitbucket.js   | 11 ++++++++---
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/src/main/twirl/gitbucket/core/helper/diff.scala.html b/src/main/twirl/gitbucket/core/helper/diff.scala.html
index fb7d1dd40..0222d22e3 100644
--- a/src/main/twirl/gitbucket/core/helper/diff.scala.html
+++ b/src/main/twirl/gitbucket/core/helper/diff.scala.html
@@ -183,14 +183,15 @@ $(function(){
   });
 
   $('.ignore-whitespace').change(function() {
-    renderOneDiff($(this).closest("table").find(".diffText"), viewType);
+    renderOneDiff($(this).closest("table").find(".diffText"), window.viewType);
   });
 
   function getInlineContainer(where) {
-    if (viewType == 0) {
+    if (window.viewType == 0) {
+      console.log(where);
       if (where === 'new') {
         return $('<tr class="not-diff"><td colspan="2"></td><td colspan="2" class="comment-box-container"></td></tr>');
-      } else if (where === 'old') {
+      } else {
         return $('<tr class="not-diff"><td colspan="2" class="comment-box-container"></td><td colspan="2"></td></tr>');
       }
     }
@@ -245,7 +246,7 @@ $(function(){
       var commitId = $this.closest('.table-bordered').attr('commitId'),
       fileName = $this.closest('.table-bordered').attr('fileName'),
       oldLineNumber, newLineNumber;
-      if (viewType == 0) {
+      if (window.viewType == 0) {
         oldLineNumber = $this.parent().prev('.oldline').attr('line-number');
         newLineNumber = $this.parent().prev('.newline').attr('line-number');
       } else {
@@ -274,7 +275,7 @@ $(function(){
   });
 
   function renderOneCommitCommentIntoDiff($v, diff){
-    var filename = $v.attr('filename');
+    //var filename = $v.attr('filename');
     var oldline  = $v.attr('oldline');
     var newline  = $v.attr('newline');
     var tmp;
@@ -369,8 +370,8 @@ $(function(){
     });
     for(var key in elements){
       filename = elements[key]['filename'];
-      oldline = elements[key]['oldline'] ? elements[key]['oldline'] : '';
-      newline = elements[key]['newline'] ? elements[key]['newline'] : '';
+      oldline = elements[key]['oldline']; //? elements[key]['oldline'] : '';
+      newline = elements[key]['newline']; //? elements[key]['newline'] : '';
 
       var $v = $('<div class="commit-comment-box reply-comment-box">')
         .append($('<input type="text" class="form-control reply-comment" placeholder="Reply..." '
@@ -398,7 +399,7 @@ $(function(){
     var i = 0, diffs = $('.diffText');
     function render(){
       if(diffs[i]){
-        var $table = renderOneDiff($(diffs[i]), viewType);
+        var $table = renderOneDiff($(diffs[i]), window.viewType);
         @if(hasWritePermission) {
           renderReplyComment($table);
         }
diff --git a/src/main/twirl/gitbucket/core/repo/commentform.scala.html b/src/main/twirl/gitbucket/core/repo/commentform.scala.html
index 6d66fd99c..e9c46d081 100644
--- a/src/main/twirl/gitbucket/core/repo/commentform.scala.html
+++ b/src/main/twirl/gitbucket/core/repo/commentform.scala.html
@@ -114,8 +114,18 @@
               .data('filename', '@fileName')
               .data('newline',  @newLineNumber.getOrElse("undefined"))
               .data('oldline',  @oldLineNumber.getOrElse("undefined")));
-          var tmp = getInlineContainer();
-          tmp.children('td:last').html($v)
+
+          @if(oldLineNumber.isDefined){
+            @if(newLineNumber.isDefined){
+              var tmp = getInlineContainer();
+            } else {
+              var tmp = getInlineContainer('old');
+            }
+            tmp.children('td:first').html($v);
+          } else {
+            var tmp = getInlineContainer('new');
+            tmp.children('td:last').html($v);
+          }
           $tr.after(tmp);
         }
 
diff --git a/src/main/webapp/assets/common/js/gitbucket.js b/src/main/webapp/assets/common/js/gitbucket.js
index d726b534f..cd18f3b51 100644
--- a/src/main/webapp/assets/common/js/gitbucket.js
+++ b/src/main/webapp/assets/common/js/gitbucket.js
@@ -76,7 +76,7 @@ function displayErrors(data, elem){
  * @param ignoreSpace {Number} 0: include, 1: ignore
  */
 function diffUsingJS(oldTextId, newTextId, outputId, viewType, ignoreSpace) {
-  var old = $('#'+oldTextId), head = $('#'+newTextId);
+  var old = $('#'+oldTextId), head = $('#' + newTextId);
   var render = new JsDiffRender({
     oldText: old.attr('data-val'),
     oldTextName: old.attr('data-file-name'),
@@ -85,8 +85,13 @@ function diffUsingJS(oldTextId, newTextId, outputId, viewType, ignoreSpace) {
     ignoreSpace: ignoreSpace,
     contextSize: 4
   });
-  var diff = render[viewType==1 ? "unified" : "split"]();
-  diff.appendTo($('#'+outputId).html(""));
+  var diff = render[viewType == 1 ? "unified" : "split"]();
+  if(viewType == 1){
+    diff.find('tr:last').after($('<tr><td></td><td></td><td></td></tr>'));
+  } else {
+    diff.find('tr:last').after($('<tr><td></td><td></td><td></td><td></td></tr>'));
+  }
+  diff.appendTo($('#' + outputId).html(""));
 }