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

fix regression: blank diff output #672

Browse Source
This commit is contained in:
nazoking
2015-03-25 09:20:20 +09:00
parent fb15fa0e43
commit 444af0935e
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -118,12 +118,17 @@ function JsDiffRender(params){
var dom = null; var dom = null;
return function(ln){ return function(ln){
if(dom===null){ if(dom===null){
dom = 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;'),
(/\.([^.]*)$/.exec(fileName)||[])[1], (/\.([^.]*)$/.exec(fileName)||[])[1],
true); true);
var re = /<li[^>]*id="?L([0-9]+)"?[^>]*>(.*?)<\/li>/gi, h;
dom=[];
while(h=re.exec(html)){
dom[h[1]]=h[2];
} }
return (new RegExp('<li id="L'+ln+'"[^>]*>(.*?)</li>').exec(dom) || [])[1]; }
return dom[ln];
}; };
} }
return this.renders(oplines, prettyDom(params.oldText, params.oldTextName), prettyDom(params.newText, params.newTextName)); return this.renders(oplines, prettyDom(params.oldText, params.oldTextName), prettyDom(params.newText, params.newTextName));