load more complete blocks if loadLimit is not reached

FredrikNoren · Feb 29, 2020 · 9c8bf6e · 9c8bf6e
1 parent 6f979da
commit 9c8bf6e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/components/textdiff/textdiff.html b/components/textdiff/textdiff.html
@@ -3,8 +3,8 @@
   <!-- ko if: isParsed -->
   <div data-bind="template: {nodes: ko.utils.parseHtmlFragment(htmlSrc)}, css: {'word-wrap': wordWrap.value}"></div>
   <!-- /ko -->
-  <div class="btn-load-more" data-bind="visible: loadMoreCount() > 0">
-    <span class="btn btn-warning" data-bind="click: loadMore, text: 'Load ' + loadMoreCount() + ' more lines'"></span>
+  <div class="btn-load-more" data-bind="visible: hasMore">
+    <span class="btn btn-warning" data-bind="click: loadMore, text: 'Load more'"></span>
   </div>
 </div>
 <!-- /ko -->
diff --git a/components/textdiff/textdiff.js b/components/textdiff/textdiff.js
@@ -61,7 +61,7 @@ class TextDiffViewModel {
     this.repoPath = args.repoPath;
     this.server = args.server;
     this.sha1 = args.sha1;
-    this.loadMoreCount = ko.observable(0);
+    this.hasMore = ko.observable(false);
     this.diffJson = null;
     this.loadCount = loadLimit;
     this.textDiffType = args.textDiffType;
@@ -134,26 +134,20 @@ class TextDiffViewModel {
         }
 
         let lineCount = 0;
+        let loadCount = 0;
         this.diffJson[0].blocks = this.diffJson[0].allBlocks.reduce((blocks, block) => {
-          const length = (block.allLines || block.lines).length;
+          const length = block.lines.length;
           const remaining = this.loadCount - lineCount;
           if (remaining > 0) {
-            if (remaining < length) {
-              if (!block.allLines) {
-                block.allLines = block.lines;
-              }
-              block.lines = block.allLines.slice(0, remaining);
-            } else if (block.allLines) {
-              block.lines = block.allLines;
-              block.allLines = undefined;
-            }
+            loadCount += length;
             blocks.push(block);
           }
           lineCount += length;
           return blocks;
         }, []);
 
-        this.loadMoreCount(Math.min(loadLimit, Math.max(0, lineCount - this.loadCount)));
+        this.loadCount = loadCount;
+        this.hasMore(lineCount > loadCount);
 
         let html = diff2html.html(this.diffJson, {
           outputFormat: this.textDiffType.value() === sideBySideDiff ? 'side-by-side' : 'line-by-line',
@@ -186,7 +180,7 @@ class TextDiffViewModel {
   }
 
   loadMore() {
-    this.loadCount += this.loadMoreCount();
+    this.loadCount += loadLimit;
     this.render();
   }