Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-05 04:56:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

(refs #2049)Fix comment top diff handling

Browse Source
This commit is contained in:
Naoki Takezoe
2018-06-24 01:01:55 +09:00
parent 49f71a5ceb
commit b5b37a1168
3 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/twirl/gitbucket/core/helper/diff.scala.html
View File

@@ -183,14 +183,15 @@ $(function(){
}); });
$('.ignore-whitespace').change(function() { $('.ignore-whitespace').change(function() {
renderOneDiff($(this).closest("table").find(".diffText"), viewType); renderOneDiff($(this).closest("table").find(".diffText"), window.viewType);
}); });
function getInlineContainer(where) { function getInlineContainer(where) {
if (viewType == 0) { if (window.viewType == 0) {
console.log(where);
if (where === 'new') { if (where === 'new') {
return $('<tr class="not-diff"><td colspan="2"></td><td colspan="2" class="comment-box-container"></td></tr>'); 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>'); 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'), var commitId = $this.closest('.table-bordered').attr('commitId'),
fileName = $this.closest('.table-bordered').attr('fileName'), fileName = $this.closest('.table-bordered').attr('fileName'),
oldLineNumber, newLineNumber; oldLineNumber, newLineNumber;
if (viewType == 0) { if (window.viewType == 0) {
oldLineNumber = $this.parent().prev('.oldline').attr('line-number'); oldLineNumber = $this.parent().prev('.oldline').attr('line-number');
newLineNumber = $this.parent().prev('.newline').attr('line-number'); newLineNumber = $this.parent().prev('.newline').attr('line-number');
} else { } else {
@@ -274,7 +275,7 @@ $(function(){
}); });
function renderOneCommitCommentIntoDiff($v, diff){ function renderOneCommitCommentIntoDiff($v, diff){
var filename = $v.attr('filename'); //var filename = $v.attr('filename');
var oldline = $v.attr('oldline'); var oldline = $v.attr('oldline');
var newline = $v.attr('newline'); var newline = $v.attr('newline');
var tmp; var tmp;
@@ -369,8 +370,8 @@ $(function(){
}); });
for(var key in elements){ for(var key in elements){
filename = elements[key]['filename']; filename = elements[key]['filename'];
oldline = elements[key]['oldline'] ? elements[key]['oldline'] : ''; oldline = elements[key]['oldline']; //? elements[key]['oldline'] : '';
newline = elements[key]['newline'] ? elements[key]['newline'] : ''; newline = elements[key]['newline']; //? elements[key]['newline'] : '';
var $v = $('<div class="commit-comment-box reply-comment-box">') var $v = $('<div class="commit-comment-box reply-comment-box">')
.append($('<input type="text" class="form-control reply-comment" placeholder="Reply..." ' .append($('<input type="text" class="form-control reply-comment" placeholder="Reply..." '
@@ -398,7 +399,7 @@ $(function(){
var i = 0, diffs = $('.diffText'); var i = 0, diffs = $('.diffText');
function render(){ function render(){
if(diffs[i]){ if(diffs[i]){
var $table = renderOneDiff($(diffs[i]), viewType); var $table = renderOneDiff($(diffs[i]), window.viewType);
@if(hasWritePermission) { @if(hasWritePermission) {
renderReplyComment($table); renderReplyComment($table);
} }

14
src/main/twirl/gitbucket/core/repo/commentform.scala.html
View File

@@ -114,8 +114,18 @@
.data('filename', '@fileName') .data('filename', '@fileName')
.data('newline', @newLineNumber.getOrElse("undefined")) .data('newline', @newLineNumber.getOrElse("undefined"))
.data('oldline', @oldLineNumber.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); $tr.after(tmp);
} }

11
src/main/webapp/assets/common/js/gitbucket.js
View File

@@ -76,7 +76,7 @@ function displayErrors(data, elem){
* @param ignoreSpace {Number} 0: include, 1: ignore * @param ignoreSpace {Number} 0: include, 1: ignore
*/ */
function diffUsingJS(oldTextId, newTextId, outputId, viewType, ignoreSpace) { function diffUsingJS(oldTextId, newTextId, outputId, viewType, ignoreSpace) {
var old = $('#'+oldTextId), head = $('#'+newTextId); var old = $('#'+oldTextId), head = $('#' + newTextId);
var render = new JsDiffRender({ var render = new JsDiffRender({
oldText: old.attr('data-val'), oldText: old.attr('data-val'),
oldTextName: old.attr('data-file-name'), oldTextName: old.attr('data-file-name'),
@@ -85,8 +85,13 @@ function diffUsingJS(oldTextId, newTextId, outputId, viewType, ignoreSpace) {
ignoreSpace: ignoreSpace, ignoreSpace: ignoreSpace,
contextSize: 4 contextSize: 4
}); });
var diff = render[viewType==1 ? "unified" : "split"](); var diff = render[viewType == 1 ? "unified" : "split"]();
diff.appendTo($('#'+outputId).html("")); 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(""));
} }