{
String binaryDiff = binaryDiffHandler.renderBinaryDiff(formatter.entry);
if (binaryDiff != null) {
- byte[] bb = ("<tr><td colspan='4'>" + binaryDiff + "</td></tr>").getBytes(StandardCharsets.UTF_8);
+ byte[] bb = ("<tr><td colspan='4' align='center'>" + binaryDiff + "</td></tr>").getBytes(StandardCharsets.UTF_8);
super.write(bb, 0, bb.length);
return;
}
ImageDiffHandler handler = new ImageDiffHandler(getContextUrl(), repositoryName,\r
parent.getName(), commit.getName(), imageExtensions);\r
diff = DiffUtils.getDiff(r, commit, blobPath, DiffOutputType.HTML, handler).content;\r
+ if (handler.getImgDiffCount() > 0) {\r
+ addBottomScript("scripts/imgdiff.js"); // Tiny support script for image diffs\r
+ }\r
add(new BookmarkablePageLink<Void>("patchLink", PatchPage.class,\r
WicketUtils.newPathParameter(repositoryName, objectId, blobPath)));\r
} else {\r
ImageDiffHandler handler = new ImageDiffHandler(getContextUrl(), repositoryName,\r
baseCommit.getName(), commit.getName(), imageExtensions);\r
diff = DiffUtils.getDiff(r, baseCommit, commit, blobPath, DiffOutputType.HTML, handler).content;\r
+ if (handler.getImgDiffCount() > 0) {\r
+ addBottomScript("scripts/imgdiff.js"); // Tiny support script for image diffs\r
+ }\r
add(new BookmarkablePageLink<Void>("patchLink", PatchPage.class,\r
WicketUtils.newBlobDiffParameter(repositoryName, baseObjectId, objectId,\r
blobPath)));\r
final ImageDiffHandler handler = new ImageDiffHandler(getContextUrl(), repositoryName,
parents.isEmpty() ? null : parents.get(0), commit.getName(), imageExtensions);
final DiffOutput diff = DiffUtils.getCommitDiff(r, commit, DiffOutputType.HTML, handler);
+ if (handler.getImgDiffCount() > 0) {
+ addBottomScript("scripts/imgdiff.js"); // Tiny support script for image diffs
+ }
// add commit diffstat
int insertions = 0;
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;
private final String baseUrl;
private final List<String> imageExtensions;
+ private int imgDiffCount = 0;
+
public ImageDiffHandler(final String baseUrl, final String repositoryName, final String oldCommitId,
final String newCommitId, final List<String> imageExtensions) {
this.baseUrl = baseUrl;
String oldUrl = getImageUrl(diffEntry, Side.OLD);
String newUrl = getImageUrl(diffEntry, Side.NEW);
if (oldUrl != null && newUrl != null) {
+ imgDiffCount++;
+ String id = "imgdiff" + imgDiffCount;
HtmlBuilder builder = new HtmlBuilder("div");
- Element container = builder.root().appendElement("div").attr("class", "imgdiff");
+ Element container = builder.root().attr("align", "center").appendElement("div").attr("class", "imgdiff");
Element resizeable = container.appendElement("div").attr("class", "imgdiff-left");
// style='max-width:640px;' is necessary for ensuring that the browser limits large images
// to some reasonable width, and to override the "img { max-width: 100%; }" from bootstrap.css,
// is too wide.
// XXX: Maybe add a max-height, too, to limit portrait-oriented images to some reasonable height?
// (Like a 300x10000px image...)
- resizeable.appendElement("img").attr("class", "imgdiff imgdiff-left").attr("style", "max-width:640px;").attr("src", oldUrl);
+ resizeable.appendElement("img").attr("class", "imgdiff-left").attr("id", id).attr("style", "max-width:640px;").attr("src", oldUrl);
container.appendElement("img").attr("class", "imgdiff").attr("style", "max-width:640px;").attr("src", newUrl);
+ builder.root().appendElement("br");
+ Element slider = builder.root().appendElement("div").attr("class", "imgdiff-slider").attr("id", "slider-" + id);
+ slider.appendElement("div").attr("class", "imgdiff-slider-inner");
return builder.toString();
}
break;
return null;
}
+ /** Returns the number of image diffs generated so far by this {@link ImageDiffHandler}. */
+ public int getImgDiffCount() {
+ return imgDiffCount;
+ }
+
/**
* Constructs a URL that will fetch the designated resource in the git repository. The returned string will
* contain the URL fully URL-escaped, but note that it may still contain unescaped ampersands, so the result
--- /dev/null
+/*
+ * Copyright 2014 Tom <tw201207@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+jQuery(function () {
+ // Runs on jQuery's document.ready and sets up the scroll event handlers for all image diffs.
+ jQuery(".imgdiff-slider").scroll(function() {
+ var w = 1.0 - (this.scrollLeft / (this.scrollWidth - (this.clientWidth || this.offsetWidth)));
+ // We encode the target img id in the slider's id: slider-imgdiffNNN.
+ jQuery('#' + this.id.substr(this.id.indexOf('-') + 1)).css("opacity", w);
+ })
+});
\r
img.imgdiff-left {\r
margin-left: 18px; /* Compensate for padding on outer div. */\r
+ user-select: none;\r
}\r
\r
img.imagediff {\r
user-select: none;\r
+ /* Checkerboard background */\r
+ background-color: white;\r
+ background-image: linear-gradient(45deg, #DDD 25%, transparent 25%, transparent 75%, #DDD 75%, #DDD), linear-gradient(45deg, #DDD 25%, transparent 25%, transparent 75%, #DDD 75%, #DDD);\r
+ background-size: 16px 16px;\r
+ background-position: 0 0, 8px 8px;\r
}\r
\r
.diff-img {\r
- margin: 2px 2px;\r
+ margin: 2px;\r
+}\r
+\r
+div.imgdiff-slider {\r
+ display: inline-block;\r
+ position: relative;\r
+ margin: 0px 2px;\r
+ width: 420px;\r
+ max-width: 420px;\r
+ height: 24px;\r
+ min-height: 18px;\r
+ overflow-x: scroll;\r
+ background: linear-gradient(to right, #F00, #0F0);\r
+}\r
+\r
+div.imgdiff-slider-inner {\r
+ position: absolute;\r
+ bottom: 0;\r
+ margin: 0;\r
+ padding: 0;\r
+ width : 1000%;\r
+ height: 1px;\r
+ border: none;\r
+ background: transparent;\r
}\r
\r
/* End image diffs */\r
projects / gitblit.git / commitdiff