Merge pull request #99 from danvk/diff-fixes

PDiff fixes

Author: danvk

webdiff/argparser.py

@@ -80,10 +80,8 @@ def parse(args):
 # TODO: move into dirdiff?
 def _shim_for_file_diff(a_file, b_file):
     '''Sets A_DIR, B_DIR and DIFF to do a one-file diff.'''
-    dirname = os.path.dirname
-    basename = os.path.basename
-    return LocalFileDiff(dirname(a_file), basename(a_file),
-                         dirname(b_file), basename(b_file),
+    return LocalFileDiff(os.path.dirname(a_file), a_file,
+                         os.path.dirname(b_file), b_file,
                          False)  # probably not a move
 
 

webdiff/static/js/components.jsx

@@ -57,11 +57,6 @@ var makeRoot = function(filePairs, initiallySelectedIndex) {
       var idx = this.getIndex(),
           filePair = this.props.filePairs[idx];
 
-      if (this.state.pdiffMode == PDIFF_MODE.BBOX && !filePair.diffData) {
-        // XXX this might shoot off unnecessary XHRs--use a Promise!
-        this.computePerceptualDiffBox();
-      }
-
       return (
         <div>
           <FileSelector selectedFileIndex={idx}
@@ -251,6 +246,7 @@ var DiffView = React.createClass({
   },
   componentDidMount: function() {
     getThickDiff(this.props.thinFilePair.idx).done(filePair => {
+      filePair.idx = this.props.thinFilePair.idx;
       this.setState({filePair});
     });
   },

webdiff/static/js/image.jsx

@@ -70,12 +70,29 @@ var ImageDiff = React.createClass({
   componentWillUnmount: function() {
     $(window).off('resize.shrink-to-fit');
   },
+  computePerceptualDiffBox: function(fp) {
+    if (!isSameSizeImagePair(fp)) return;
+    $.getJSON(`/pdiffbbox/${fp.idx}`)
+        .done(bbox => {
+          if (!fp.diffData) fp.diffData = {};
+          fp.diffData.diffBounds = bbox;
+          this.forceUpdate();  // tell react about this change
+        }).fail(error => {
+          console.error(error);
+        });
+  },
   render: function() {
     var mode = this.props.imageDiffMode;
     var pair = this.props.filePair;
     if (isOneSided(pair)) {
       mode = 'side-by-side';  // Only one that makes sense for one-sided diffs.
     }
+
+    if (this.props.pdiffMode == PDIFF_MODE.BBOX && !pair.diffData) {
+      // XXX this might shoot off unnecessary XHRs--use a Promise!
+      this.computePerceptualDiffBox(pair);
+    }
+
     var component = {
       'side-by-side': ImageSideBySide,
       'blink': ImageBlinker,