Merge pull request #1073 from gitblit/1062-DocEditorUpdates

Paul Martin

2016-04-30 a502d96a860456ec5e8c96761db70f7cabb74751

 src/main/java/com/gitblit/wicket/pages/BlobDiffPage.java

@@ -57,7 +57,7 @@
         RevCommit parent = commit.getParentCount() == 0 ? null : commit.getParent(0);

         ImageDiffHandler handler = new ImageDiffHandler(this, repositoryName,

               parent.getName(), commit.getName(), imageExtensions);

         diff = DiffUtils.getDiff(r, commit, blobPath, diffComparator, DiffOutputType.HTML, handler).content;

         diff = DiffUtils.getDiff(r, commit, blobPath, diffComparator, DiffOutputType.HTML, handler, 3).content;

         if (handler.getImgDiffCount() > 0) {

            addBottomScript("scripts/imgdiff.js"); // Tiny support script for image diffs

         }

@@ -68,7 +68,7 @@
         RevCommit baseCommit = JGitUtils.getCommit(r, baseObjectId);

         ImageDiffHandler handler = new ImageDiffHandler(this, repositoryName,

               baseCommit.getName(), commit.getName(), imageExtensions);

         diff = DiffUtils.getDiff(r, baseCommit, commit, blobPath, diffComparator, DiffOutputType.HTML, handler).content;

         diff = DiffUtils.getDiff(r, baseCommit, commit, blobPath, diffComparator, DiffOutputType.HTML, handler, 3).content;

         if (handler.getImgDiffCount() > 0) {

            addBottomScript("scripts/imgdiff.js"); // Tiny support script for image diffs

         }