Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-02 19:45:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1030 from team-lab/fix/image-diff

Browse Source 
Fix/image diff
This commit is contained in:
Naoki Takezoe
2016-01-05 01:09:15 +09:00
parent f6624c0002 d62fc6e135
commit b50ca63c2b
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -104,7 +104,7 @@
<textarea id="oldText-@i" style="display: none;" data-file-name="@diff.newPath">@diff.oldContent.getOrElse("")</textarea>
} else {
@if(diff.newIsImage || diff.oldIsImage){
<div class="diff-image-render diff2up">@diff.oldIsImage @diff.newIsImage
<div class="diff-image-render diff2up">
@if(oldCommitId.isDefined && diff.oldIsImage){
<div class="diff-image-frame diff-old"><img src="@url(repository)/raw/@oldCommitId.get/@diff.oldPath" class="diff-image" onload="onLoadedDiffImages(this)" style="display:none" /></div>
} else {

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

@@ -606,7 +606,7 @@ var imageDiff ={
.css({marginTop:size.height-5});
var bar = $('<hr class="diff-silde-bar">').css({top:size.height+size.paddingTop});
var div = $('<div class="diff-image-stack">')
.css({height:size.height+size.paddingTop, paddingLeft:size.padding})
.css({height:size.height+size.paddingTop*2, paddingLeft:size.padding})
.append(diffOld, diffNew, bar, handle);
return {
neo:diffNew,