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

Fix #1871: Fixed breaking newlines when starting with multiple blank lines

Browse Source
This commit is contained in:
arimuraterutoshiMac
2018-04-19 01:51:24 +09:00
parent 35655f33c7
commit 6926aa7aec
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -103,8 +103,8 @@
} else { } else {
@if(diff.newContent != None || diff.oldContent != None){ @if(diff.newContent != None || diff.oldContent != None){
<div id="diffText-@i" class="diffText"></div> <div id="diffText-@i" class="diffText"></div>
<textarea id="newText-@i" style="display: none;" data-file-name="@diff.oldPath">@diff.newContent.getOrElse("")</textarea> <textarea id="newText-@i" style="display: none;" data-file-name="@diff.oldPath" data-val='@diff.newContent.getOrElse("")'></textarea>
<textarea id="oldText-@i" style="display: none;" data-file-name="@diff.newPath">@diff.oldContent.getOrElse("")</textarea> <textarea id="oldText-@i" style="display: none;" data-file-name="@diff.newPath" data-val='@diff.oldContent.getOrElse("")'></textarea>
} else { } else {
@if(diff.newIsImage || diff.oldIsImage){ @if(diff.newIsImage || diff.oldIsImage){
<div class="diff-image-render diff2up"> <div class="diff-image-render diff2up">

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

@@ -78,9 +78,9 @@ function displayErrors(data, elem){
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.val(), oldText: old.data('val'),
oldTextName: old.data('file-name'), oldTextName: old.data('file-name'),
newText: head.val(), newText: head.data('val'),
newTextName: head.data('file-name'), newTextName: head.data('file-name'),
ignoreSpace: ignoreSpace, ignoreSpace: ignoreSpace,
contextSize: 4 contextSize: 4
@@ -116,7 +116,7 @@ function JsDiffRender(params){
return function(ln){ return function(ln){
if(dom===null){ if(dom===null){
var html = prettyPrintOne( var html = prettyPrintOne(
text.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/"/g,'&quot;').replace(/>/g,'&gt;'), text.replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/"/g,'&quot;').replace(/>/g,'&gt;').replace(/^\n/, '\n\n'),
(/\.([^.]*)$/.exec(fileName)||[])[1], (/\.([^.]*)$/.exec(fileName)||[])[1],
true); true);
var re = /<li[^>]*id="?L([0-9]+)"?[^>]*>(.*?)<\/li>/gi, h; var re = /<li[^>]*id="?L([0-9]+)"?[^>]*>(.*?)<\/li>/gi, h;