Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-12-22 00:09:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1996 from kounoike/fix-json-diff

Browse Source 
Fix JSON diff issue.
This commit is contained in:
Naoki Takezoe
2018-05-06 02:26:06 +09:00
committed by GitHub
parent f321d0974e 378b3986dc
commit 33c0fb680e
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,10 +78,10 @@ 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.data('val'), oldText: old.attr('data-val'),
oldTextName: old.data('file-name'), oldTextName: old.attr('data-file-name'),
newText: head.data('val'), newText: head.attr('data-val'),
newTextName: head.data('file-name'), newTextName: head.attr('data-file-name'),
ignoreSpace: ignoreSpace, ignoreSpace: ignoreSpace,
contextSize: 4 contextSize: 4
}); });