diff options
| author | James Moger <james.moger@gitblit.com> | 2014-11-17 08:06:34 -0600 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-11-17 08:06:34 -0600 |
| commit | dbd9e1538976518e8514961f4dc7d0771eb6634b (patch) | |
| tree | b214a0ff465c4f0f9391265406736a3355a9937f /src/main/java/com/gitblit/wicket/pages/ComparePage.java | |
| parent | 8cd4feca58b55f311a543c744777e930c4f4b34a (diff) | |
| parent | 4fdbcf55a0d9938e1a131f65f5b61f9f79ad2452 (diff) | |
| download | gitblit-dbd9e1538976518e8514961f4dc7d0771eb6634b.tar.gz gitblit-dbd9e1538976518e8514961f4dc7d0771eb6634b.zip | |
Merged #88 "Image diff could display before & after images"
Diffstat (limited to 'src/main/java/com/gitblit/wicket/pages/ComparePage.java')
| -rw-r--r-- | src/main/java/com/gitblit/wicket/pages/ComparePage.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/main/java/com/gitblit/wicket/pages/ComparePage.java b/src/main/java/com/gitblit/wicket/pages/ComparePage.java index 3b8bb03e..c0141eba 100644 --- a/src/main/java/com/gitblit/wicket/pages/ComparePage.java +++ b/src/main/java/com/gitblit/wicket/pages/ComparePage.java @@ -37,6 +37,7 @@ import org.eclipse.jgit.diff.DiffEntry.ChangeType; import org.eclipse.jgit.lib.Repository; import org.eclipse.jgit.revwalk.RevCommit; +import com.gitblit.Keys; import com.gitblit.models.PathModel.PathChangeModel; import com.gitblit.models.RefModel; import com.gitblit.models.RepositoryModel; @@ -111,7 +112,14 @@ public class ComparePage extends RepositoryPage { fromCommitId.setObject(startId); toCommitId.setObject(endId); - final DiffOutput diff = DiffUtils.getDiff(r, fromCommit, toCommit, DiffOutputType.HTML); + final List<String> imageExtensions = app().settings().getStrings(Keys.web.imageExtensions); + final ImageDiffHandler handler = new ImageDiffHandler(getContextUrl(), repositoryName, + fromCommit.getName(), toCommit.getName(), imageExtensions); + + final DiffOutput diff = DiffUtils.getDiff(r, fromCommit, toCommit, DiffOutputType.HTML, handler); + if (handler.getImgDiffCount() > 0) { + addBottomScript("scripts/imgdiff.js"); // Tiny support script for image diffs + } // add compare diffstat int insertions = 0; |