]> source.dussan.org Git - gitblit.git/commit
Add a blink comparator and pixel difference to image diffs 231/head 22/222/1
authorTom <tw201207@gmail.com>
Mon, 17 Nov 2014 23:25:41 +0000 (00:25 +0100)
committerTom <tw201207@gmail.com>
Wed, 19 Nov 2014 14:09:16 +0000 (15:09 +0100)
commitb6f47539cd1a1dafe05ffd6fdc40bce4547c479d
tree04f5db704f631223b3ca8706cbd5e8fea3a42484
parentd85396ad73ef7ae5e142b76136ee61e0e3286a4f
Add a blink comparator and pixel difference to image diffs

Pixel difference uses CSS mix-blend-mode, which is supported currently
only on Firefox >= 32 and on Safari >= 7.1. Implementation is behind a
Javascript feature test.

For other browsers, there's a blink comparator.

Code changes:

* ImageDiffHandler now takes the page it's used on as argument. We need
  that to get labels. DOM generated is a
  little bit different (new controls).

* Diff pages adapted to new constructor of ImageDiffHandler.

* CSS and Javascript changes implementing the new controls, making use
  of two new static image resources. Since I felt that the new controls
  deserved tooltips, I also gave the opacity slider a tooltip: changed
  to <a>, and slider handle changed from <div> to <span>. CSS ensures
  everything still displays the same (basically display:inline-block).

* Supplied messages for English, French, and German for the new
  tooltips.

Tested on IE8, Safari 6.1.6 & 7.1, Chrome 38, FF 33.1 & FF 3.6.13
src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
src/main/java/com/gitblit/wicket/GitBlitWebApp_de.properties
src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties
src/main/java/com/gitblit/wicket/pages/BlobDiffPage.java
src/main/java/com/gitblit/wicket/pages/CommitDiffPage.java
src/main/java/com/gitblit/wicket/pages/ComparePage.java
src/main/java/com/gitblit/wicket/pages/ImageDiffHandler.java
src/main/java/com/gitblit/wicket/pages/scripts/imgdiff.js
src/main/resources/blink32.png [new file with mode: 0644]
src/main/resources/gitblit.css
src/main/resources/sub32.png [new file with mode: 0644]