automatically resize diff pane to match window height. Does not adjus…

…t dynamically as the window is resized, however
jhewlett · Sep 29, 2013 · 867fbdc · 867fbdc
1 parent a88e9cf
commit 867fbdc
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/air/diffCmd.html b/air/diffCmd.html
@@ -32,6 +32,9 @@ <h3>Edit</h3>
     function appLoad() {
         window.nativeWindow.maximize();
 
+        maximizeHeight(document.getElementById('scrollLeft'));
+        maximizeHeight(document.getElementById('scrollRight'));
+
         air.NativeApplication.nativeApplication.addEventListener(air.InvokeEvent.INVOKE, onInvoke);
 
         var scrollLeft = document.getElementById('scrollLeft');
@@ -48,6 +51,12 @@ <h3>Edit</h3>
         });
     }
 
+    function maximizeHeight(element) {
+        if (window.innerHeight) {
+            element.style.height = (window.innerHeight - element.offsetTop - 10) + "px";
+        }
+    }
+
     function onInvoke(event) {
         var original = readFile(event.currentDirectory, event.arguments[0]);
         var edit = readFile(event.currentDirectory, event.arguments[1]);

diff --git a/src/Diff.js b/src/Diff.js
@@ -30,8 +30,8 @@ SourceDiff.Diff = function(ignoreLeadingWS) {
         var originalTrimmed = checkTrimLeadingWhiteSpace(originalLine);
         var editedTrimmed = checkTrimLeadingWhiteSpace(editedLine);
 
-        var s1Offset = originalLine.length - originalTrimmed.length;
-        var s2Offset = editedLine.length - editedTrimmed.length;
+        var originalOffset = originalLine.length - originalTrimmed.length;
+        var editOffset = editedLine.length - editedTrimmed.length;
 
         originalTrimmed = trimTrailingWhiteSpace(originalTrimmed);
         editedTrimmed = trimTrailingWhiteSpace(editedTrimmed);
@@ -48,18 +48,18 @@ SourceDiff.Diff = function(ignoreLeadingWS) {
         while (i >= 0 && j >= 0) {
             if (originalTrimmed[i - 1] === editedTrimmed[j - 1]) {
                 if (originalTrimmed[i - 1]) {
-                    diff.addCommon(s1Offset + i - 1, s2Offset + j - 1);
+                    diff.addCommon(originalOffset + i - 1, editOffset + j - 1);
                 }
                 i--;
                 j--;
             } else if (j >= 0 && (i === 0 || matrix[i][j - 1] >= matrix[i - 1][j])) {
                 if (editedTrimmed[j - 1].length > 0) {
-                    diff.addInsert(s2Offset + j - 1);
+                    diff.addInsert(editOffset + j - 1);
                 }
                 j--;
             } else if (i >= 0 && (j === 0 || matrix[i][j - 1] < matrix[i - 1][j])) {
                 if (originalTrimmed[i - 1].length > 0) {
-                    diff.addDelete(s1Offset + i - 1);
+                    diff.addDelete(originalOffset + i - 1);
                 }
                 i--;
             }