Skip to content

Commit 529ca51

Browse files
committed
Handle images with identical pixels better
1 parent 7fb72b9 commit 529ca51

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

webdiff/static/js/components.jsx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,8 +258,11 @@ var NoChanges = React.createClass({
258258
filePair: React.PropTypes.object.isRequired
259259
},
260260
render: function() {
261-
if (this.props.filePair.no_changes) {
262-
return <div className="no-changes">(No Changes)</div>;
261+
var fp = this.props.filePair;
262+
if (fp.no_changes) {
263+
return <div className="no-changes">(File content is identical)</div>;
264+
} else if (fp.is_image_diff && fp.are_same_pixels) {
265+
return <div className="no-changes">Pixels are the same, though file content differs (perhaps the headers are different?)</div>;
263266
} else {
264267
return null;
265268
}

webdiff/static/js/image.jsx

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ function makePerceptualBoxDiv(pdiffMode, filePair, scaleDown) {
140140
if (filePair.diffData &&
141141
filePair.diffData.diffBounds) {
142142
var bbox = filePair.diffData.diffBounds;
143+
if (bbox.width == 0 || bbox.height == 0) return null;
143144
var styles = {
144145
top: Math.floor(scaleDown * (bbox.top - padding)) + 'px',
145146
left: Math.floor(scaleDown * (bbox.left - padding)) + 'px',
@@ -434,3 +435,17 @@ var ImageSwipe = React.createClass({
434435
);
435436
}
436437
});
438+
439+
440+
var NoPixelsChanged = React.createClass({
441+
propTypes: {
442+
filePair: React.PropTypes.object.isRequired
443+
},
444+
render: function() {
445+
if (this.props.filePair.are_same_pixels) {
446+
return <div className="no-changes">(Pixels are identical)</div>;
447+
} else {
448+
return null;
449+
}
450+
}
451+
});

0 commit comments

Comments
 (0)