diff options
| author | James Moger <james.moger@gitblit.com> | 2015-05-22 11:39:49 -0600 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2015-05-22 11:39:49 -0600 |
| commit | a89679ebd62d5b524b8e6a11a2a6eccc2774e1a3 (patch) | |
| tree | a8c375dc296fc857338034898cf3a14f7b7beafc /src/main/java/com/gitblit/wicket/pages/ComparePage.java | |
| parent | 99450c557d895c94e7eec618218d0f4bc5c16ffd (diff) | |
| parent | 310a807f07ceeaa7d8fa0890d9061021707bbeb8 (diff) | |
| download | gitblit-a89679ebd62d5b524b8e6a11a2a6eccc2774e1a3.tar.gz gitblit-a89679ebd62d5b524b8e6a11a2a6eccc2774e1a3.zip | |
Merged #253 "Implement configurable tab length support for blob views"
Diffstat (limited to 'src/main/java/com/gitblit/wicket/pages/ComparePage.java')
| -rw-r--r-- | src/main/java/com/gitblit/wicket/pages/ComparePage.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/com/gitblit/wicket/pages/ComparePage.java b/src/main/java/com/gitblit/wicket/pages/ComparePage.java index d1710446..7e7ac2f5 100644 --- a/src/main/java/com/gitblit/wicket/pages/ComparePage.java +++ b/src/main/java/com/gitblit/wicket/pages/ComparePage.java @@ -119,9 +119,9 @@ public class ComparePage extends RepositoryPage { final List<String> imageExtensions = app().settings().getStrings(Keys.web.imageExtensions); final ImageDiffHandler handler = new ImageDiffHandler(this, repositoryName, fromCommit.getName(), toCommit.getName(), imageExtensions); - final DiffComparator diffComparator = WicketUtils.getDiffComparator(params); - final DiffOutput diff = DiffUtils.getDiff(r, fromCommit, toCommit, diffComparator, DiffOutputType.HTML, handler); + final int tabLength = app().settings().getInteger(Keys.web.tabLength, 4); + final DiffOutput diff = DiffUtils.getDiff(r, fromCommit, toCommit, diffComparator, DiffOutputType.HTML, handler, tabLength); if (handler.getImgDiffCount() > 0) { addBottomScript("scripts/imgdiff.js"); // Tiny support script for image diffs } |