Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2026-05-07 20:47:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix code format

Browse Source
This commit is contained in:
Naoki Takezoe
2016-12-10 23:40:40 +09:00
parent 50d6f0c96f
commit 5d928b1a62
1 changed files with 34 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,24 +146,24 @@ $(function(){
}
// Render diffs as unified mode initially
if(("&"+location.search.substring(1)).indexOf("&w=1")!=-1){
if(("&" + location.search.substring(1)).indexOf("&w=1") != -1){
$('.ignore-whitespace').prop('checked',true);
}
window.viewType=1;
if(("&"+location.search.substring(1)).indexOf("&diff=split")!=-1){
window.viewType = 1;
if(("&" + location.search.substring(1)).indexOf("&diff=split") != -1){
$('.container').removeClass('container').addClass('container-wide');
window.viewType=0;
window.viewType = 0;
}
renderDiffs();
$('#btn-unified').click(function(){
window.viewType=1;
window.viewType = 1;
$('.container-wide').removeClass('container-wide').addClass('container');
renderDiffs();
});
$('#btn-split').click(function(){
window.viewType=0;
window.viewType = 0;
$('.container').removeClass('container').addClass('container-wide');
renderDiffs();
});
@@ -192,9 +192,10 @@ $(function(){
$('#comment-list').children('.inline-comment').hide();
}
$('.diff-outside').on('click','table.diff .add-comment',function() {
var $this = $(this),
$tr = $this.closest('tr'),
$check = $this.closest('table:not(.diff)').find('.toggle-notes');
var $this = $(this);
var $tr = $this.closest('tr');
var $check = $this.closest('table:not(.diff)').find('.toggle-notes');
var url = '';
if (!$check.prop('checked')) {
$check.prop('checked', true).trigger('change');
}
@@ -216,33 +217,28 @@ $(function(){
if (!isNaN(newLineNumber) && newLineNumber) {
url += ('&newLineNumber=' + newLineNumber)
}
$.get(
url,
{
dataType : 'html'
},
function(responseContent) {
var tmp;
if (!isNaN(oldLineNumber) && oldLineNumber) {
if (!isNaN(newLineNumber) && newLineNumber) {
tmp = getInlineContainer();
} else {
tmp = getInlineContainer('old');
}
$.get(url, { dataType : 'html' }, function(responseContent) {
var tmp;
if (!isNaN(oldLineNumber) && oldLineNumber) {
if (!isNaN(newLineNumber) && newLineNumber) {
tmp = getInlineContainer();
} else {
tmp = getInlineContainer('new');
tmp = getInlineContainer('old');
}
tmp.addClass('inline-comment-form').children('.comment-box-container').html(responseContent);
$tr.nextAll(':not(.not-diff):first').before(tmp);
} else {
tmp = getInlineContainer('new');
}
);
tmp.addClass('inline-comment-form').children('.comment-box-container').html(responseContent);
$tr.nextAll(':not(.not-diff):first').before(tmp);
});
}
}).on('click', 'table.diff .btn-default', function() {
$(this).closest('.inline-comment-form').remove();
});
function renderOneCommitCommentIntoDiff($v, diff){
var filename = $v.attr('filename'),
oldline = $v.attr('oldline'), newline = $v.attr('newline');
var filename = $v.attr('filename');
var oldline = $v.attr('oldline');
var newline = $v.attr('newline');
var tmp;
var diff;
if (typeof oldline !== 'undefined') {
@@ -264,26 +260,26 @@ $(function(){
tmp.hide();
}
}
function renderStatBar(add,del){
if(add+del>5){
function renderStatBar(add, del){
if(add + del > 5){
if(add){
if(add<del){
add = Math.floor(1 + (add * 4 / (add+del)));
}else{
} else {
add = Math.ceil(1 + (add * 4 / (add+del)));
}
}
del = 5-add;
del = 5 - add;
}
var ret = $('<div class="diffstat-bar">');
for(var i=0;i<5;i++){
for(var i = 0; i < 5; i++){
if(add){
ret.append('<span class="text-diff-added">■</span>');
add --;
}else if(del){
add--;
} else if(del){
ret.append('<span class="text-diff-deleted">■</span>');
del --;
}else{
del--;
} else {
ret.append('■');
}
}
@@ -312,7 +308,7 @@ $(function(){
}
}
function renderDiffs(){
var i=0, diffs = $('.diffText');
var i = 0, diffs = $('.diffText');
function render(){
if(diffs[i]){
renderOneDiff($(diffs[i]), viewType);