@if(oldCommitId.isEmpty && newCommitId.isDefined) {
@@ -59,7 +64,7 @@
}
');
- for(var i = 0; i < 5; i++){
+ const ret = $('
');
+ for(let i = 0; i < 5; i++){
if(add){
ret.append('■');
add--;
@@ -327,13 +352,13 @@
return ret;
}
- function renderOneDiff(diffText, viewType){
- var table = diffText.closest("table[data-diff-id]");
- var i = table.data("diff-id");
- var ignoreWhiteSpace = table.find('.ignore-whitespace').prop('checked');
- diffUsingJS('oldText-' + i, 'newText-' + i, diffText.attr('id'), viewType, ignoreWhiteSpace);
- var add = diffText.find("table").attr("add") * 1;
- var del = diffText.find("table").attr("del") * 1;
+ function renderOneDiff(diffText, viewType, fileHash){
+ const table = diffText.closest("table[data-diff-id]");
+ const i = table.data("diff-id");
+ const ignoreWhiteSpace = table.find('.ignore-whitespace').prop('checked');
+ diffUsingJS('oldText-' + i, 'newText-' + i, diffText.attr('id'), viewType, ignoreWhiteSpace, fileHash);
+ const add = diffText.find("table").attr("add") * 1;
+ const del = diffText.find("table").attr("del") * 1;
table.find(".diffstat").text(add + del + " ").append(renderStatBar(add, del)).attr("title", add + " additions & " + del + " deletions").tooltip();
$('span.diffstat[data-diff-id="' + i + '"]')
.html('+' + add + '-' + del + '')
@@ -347,7 +372,7 @@
});
}
@if(showLineNotes){
- var fileName = table.attr('filename');
+ const fileName = table.attr('filename');
$('.inline-comment').each(function(i, v) {
if($(this).attr('filename') == fileName){
renderOneCommitCommentIntoDiff($(this), table);
@@ -358,13 +383,13 @@
}
function renderReplyComment($table){
- var elements = {};
- var filename, newline, oldline;
+ const elements = {};
+ let filename, newline, oldline;
$table.find('.comment-box-container .inline-comment').each(function(i, e){
filename = $(e).attr('filename');
newline = $(e).attr('newline');
oldline = $(e).attr('oldline');
- var key = filename + '-' + newline + '-' + oldline;
+ const key = filename + '-' + newline + '-' + oldline;
elements[key] = {
element: $(e),
filename: filename,
@@ -372,18 +397,18 @@
oldline: oldline
};
});
- for(var key in elements){
+ for(const key in elements){
filename = elements[key]['filename'];
oldline = elements[key]['oldline']; //? elements[key]['oldline'] : '';
newline = elements[key]['newline']; //? elements[key]['newline'] : '';
- var $v = $('
').append(bc.slice(o[1], o[2]))); + } + if(o[4] != o[3]){ + ret.head.push($('').append(nc.slice(o[3], o[4]))); + } + break; } } return ret; } }, flatten: function(opcodes, headTextLines, baseTextLines, isIgnoreLine){ - var ret = [], add=0, del=0; - for (var idx = 0; idx < opcodes.length; idx++) { - var code = opcodes[idx]; - var change = code[0]; - var b = code[1]; - var n = code[3]; - var rowcnt = Math.max(code[2] - b, code[4] - n); - for (var i = 0; i < rowcnt; i++) { + let ret = [], add = 0, del = 0; + for (let idx = 0; idx < opcodes.length; idx++) { + const code = opcodes[idx]; + const change = code[0]; + let b = code[1]; + let n = code[3]; + const rowcnt = Math.max(code[2] - b, code[4] - n); + for (let i = 0; i < rowcnt; i++) { switch(change){ - case 'insert': - add++; - ret.push({ - change:(isIgnoreLine(headTextLines[n]) ? 'equal' : change), - head: ++n - }); - break; - case 'delete': - del++; - ret.push({ - change: (isIgnoreLine(baseTextLines[b]) ? 'equal' : change), - base: ++b - }); - break; - case 'replace': - add++; - del++; - var r = {change: change}; - if(n contextSize){
+ } else {
+ if (skips.length > contextSize) {
ret.push({
- change:'skip',
- start:skips[0],
- end:skips[skips.length-contextSize]
+ change: 'skip',
+ start: skips[0],
+ end: skips[skips.length-contextSize]
});
}
ret = ret.concat(skips.splice(- contextSize));
@@ -326,7 +331,7 @@
bskip = 0;
}
}
- if(skips.length > contextSize){
+ if (skips.length > contextSize) {
ret.push({
change:'skip',
start:skips[0],
@@ -344,12 +349,12 @@
*/
function scrollIntoView(target){
target = $(target);
- var $window = $(window);
- var docViewTop = $window.scrollTop();
- var docViewBottom = docViewTop + $window.height();
+ const $window = $(window);
+ const docViewTop = $window.scrollTop();
+ const docViewBottom = docViewTop + $window.height();
- var elemTop = target.offset().top;
- var elemBottom = elemTop + target.height();
+ const elemTop = target.offset().top;
+ const elemBottom = elemTop + target.height();
if(elemBottom > docViewBottom){
$('html, body').scrollTop(elemBottom - $window.height());