diff --git a/src/main/twirl/gitbucket/core/helper/diff.scala.html b/src/main/twirl/gitbucket/core/helper/diff.scala.html index bf16270..c581c8b 100644 --- a/src/main/twirl/gitbucket/core/helper/diff.scala.html +++ b/src/main/twirl/gitbucket/core/helper/diff.scala.html @@ -103,8 +103,8 @@ } else { @if(diff.newContent != None || diff.oldContent != None){
- - + + } else { @if(diff.newIsImage || diff.oldIsImage){
diff --git a/src/main/webapp/assets/common/js/gitbucket.js b/src/main/webapp/assets/common/js/gitbucket.js index 991b254..3cbbcc4 100644 --- a/src/main/webapp/assets/common/js/gitbucket.js +++ b/src/main/webapp/assets/common/js/gitbucket.js @@ -78,9 +78,9 @@ function diffUsingJS(oldTextId, newTextId, outputId, viewType, ignoreSpace) { var old = $('#'+oldTextId), head = $('#'+newTextId); var render = new JsDiffRender({ - oldText: old.val(), + oldText: old.data('val'), oldTextName: old.data('file-name'), - newText: head.val(), + newText: head.data('val'), newTextName: head.data('file-name'), ignoreSpace: ignoreSpace, contextSize: 4 @@ -116,7 +116,7 @@ return function(ln){ if(dom===null){ var html = prettyPrintOne( - text.replace(/&/g,'&').replace(//g,'>'), + text.replace(/&/g,'&').replace(//g,'>').replace(/^\n/, '\n\n'), (/\.([^.]*)$/.exec(fileName)||[])[1], true); var re = /]*id="?L([0-9]+)"?[^>]*>(.*?)<\/li>/gi, h;