Skip to content

Commit 7b1af4b

Browse files
committed
Improve image diffs
This is a GitBlit 1.7.0 preview: essentially * gitblit-org/gitblit#229 * gitblit-org/gitblit#230 * gitblit-org/gitblit#231 * gitblit-org/gitblit#232 Replace the CSS-based slider by a JavaScript-based one, plus blink comparator, plus pixel difference on browsers that support it.
1 parent 684520f commit 7b1af4b

File tree

14 files changed

+1307
-51
lines changed

14 files changed

+1307
-51
lines changed

pom.xml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ limitations under the License.
2020
<artifactId>gitblit-plugin</artifactId>
2121
<description>GitBlit for Gerrit integrated as a plugin</description>
2222
<name>Gerrit - GitBlit Plugin</name>
23-
<version>2.9.1.162.1-SNAPSHOT</version><!-- Gerrit API version followed by collapsed GitBlit version, followed by plugin version -->
23+
<version>2.9.1.162.2-SNAPSHOT</version><!-- Gerrit API version followed by collapsed GitBlit version, followed by plugin version -->
2424
<licenses>
2525
<license>
2626
<name>Apache License 2.0</name>
@@ -223,16 +223,20 @@ limitations under the License.
223223
We replace some parts of GitBlit related to tits diff display. This fixes GitBlit issue 450,
224224
and also adds improved image diff capabilities.
225225
-->
226-
<exclude>com/gitblit/utils/GitBlitDiffFormatter.class</exclude>
226+
<exclude>com/gitblit/utils/GitBlitDiffFormatter.class</exclude> <!-- Diff improvements -->
227227
<exclude>com/gitblit/utils/DiffUtils.class</exclude>
228228
<exclude>com/gitblit/utils/DiffUtils$*.class</exclude>
229-
<exclude>com/gitblit/wicket/pages/CommitDiffPage.class</exclude>
229+
<exclude>com/gitblit/wicket/pages/BasePage.class</exclude><!-- Support for bottom scripts -->
230+
<exclude>com/gitblit/wicket/pages/BasePage$*.class</exclude>
231+
<exclude>com/gitblit/wicket/pages/BlobPage.class</exclude><!-- Bug fix -->
232+
<exclude>com/gitblit/wicket/pages/BlobPage$*.class</exclude>
233+
<exclude>com/gitblit/wicket/pages/CommitDiffPage.class</exclude><!-- Diff improvements -->
230234
<exclude>com/gitblit/wicket/pages/CommitDiffPage$*.class</exclude>
231235
<exclude>com/gitblit/wicket/pages/ComparePage.class</exclude>
232236
<exclude>com/gitblit/wicket/pages/ComparePage$*.class</exclude>
233237
<exclude>com/gitblit/wicket/pages/BlobDiffPage.class</exclude>
234238
<exclude>com/gitblit/wicket/pages/BlobDiffPage$*.class</exclude>
235-
<exclude>gitblit.css</exclude>
239+
<exclude>gitblit.css</exclude><!-- Diff improvements -->
236240
</excludes>
237241
</filter>
238242
<filter>

src/main/java/com/gitblit/utils/GitBlitDiffFormatter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ public void write(byte[] b, int offset, int length) {
143143
if (binaryDiffHandler != null && RawParseUtils.decode(Arrays.copyOfRange(b, offset, offset + length)).contains(BINARY_DIFFERENCE)) {
144144
String binaryDiff = binaryDiffHandler.renderBinaryDiff(formatter.entry);
145145
if (binaryDiff != null) {
146-
byte[] bb = ("<tr><td colspan='4'>" + binaryDiff + "</td></tr>").getBytes(StandardCharsets.UTF_8);
146+
byte[] bb = ("<tr><td colspan='4' align='center'>" + binaryDiff + "</td></tr>").getBytes(StandardCharsets.UTF_8);
147147
super.write(bb, 0, bb.length);
148148
return;
149149
}

0 commit comments

Comments
 (0)