Fix vertical sizing for diff pane in Air view. Show one more line of common text below the last edit.

jhewlett · jhewlett · commit daa8bba6a6f0 · 2013-09-30T22:00:05.000-06:00
diff --git a/air/air_style.css b/air/air_style.css
@@ -0,0 +1,15 @@
+.left {
+    margin-right: 50%;
+    float: none;
+}
+
+.right {
+    margin-left: 50%;
+    float: none;
+}
+
+.scroll {
+    position: absolute;
+    top: 0; right: 0; bottom: 0; left: 0;
+    height: auto;
+}
diff --git a/air/diffCmd.html b/air/diffCmd.html
@@ -3,18 +3,19 @@
 <head>
     <title>SourceDiff</title>
     <link href="bootstrap.min.css" rel="stylesheet" type="text/css">
-    <link href="style.css" rel="stylesheet" type="text/css">
+    <link href="main_style.css" rel="stylesheet" type="text/css">
+    <link href="air_style.css" rel="stylesheet" type="text/css">
     <script src="AIRAliases.js" type="text/javascript"></script>
 </head>
 <body onload="appLoad()">
-<div class="wrapper">
-    <div class="left">
-        <h3>Original</h3>
-    </div>
-    <div class="right">
-        <h3>Edit</h3>
-    </div>
-</div>
+<!--<div class="wrapper">-->
+    <!--<div class="left">-->
+        <!--<h3>Original</h3>-->
+    <!--</div>-->
+    <!--<div class="right">-->
+        <!--<h3>Edit</h3>-->
+    <!--</div>-->
+<!--</div>-->
 <div class="wrapper">
     <div class="left scroll" id="scrollLeft">
         <pre id="original_result"></pre>
@@ -32,9 +33,6 @@ <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');
@@ -51,12 +49,6 @@ <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/LineFormatter.js b/src/LineFormatter.js
@@ -97,7 +97,7 @@ SourceDiff.LineFormatter = function(results, lineDiffs) {
 
         var lastEdit = Math.max(lastDelete, lastAdd);
 
-        return Math.min(lines.length, lastEdit + 10);
+        return Math.min(lines.length, lastEdit + 11);
     };
 
     var getClassNameLeft = function (results, i) {
diff --git a/src/diff.html b/src/diff.html
@@ -3,7 +3,7 @@
 <head>
     <title>Diff test</title>
     <link href="../lib/bootstrap.min.css" rel="stylesheet" type="text/css">
-    <link href="style.css" rel="stylesheet" type="text/css">
+    <link href="main_style.css" rel="stylesheet" type="text/css">
 </head>
 <body>
 <div class="wrapper">
diff --git a/src/main_style.css b/src/main_style.css
