From 03f10739d88b6267f0f9af702e01a5cae9c4e8e3 Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Mon, 28 Dec 2020 14:42:47 +0100
Subject: [PATCH] Extract common functionality into a new
 `BaseTreeViewer._finishRendering` method

Note how the end of the `{PDFOutlineViewer, PDFAttachmentViewer, PDFLayerViewer}.render` methods share *almost* identical code, hence we can reduce some duplication by introducing the new `BaseTreeViewer` helper method here.

Furthermore, setting `this._lastToggleIsShow` can be made ever so slightly more efficient, since we don't care about the number of ".treeItemsHidden"-classes but only want to know if at least one exists.
---
 web/base_tree_viewer.js      | 14 ++++++++++++++
 web/pdf_attachment_viewer.js |  4 +---
 web/pdf_layer_viewer.js      | 10 +---------
 web/pdf_outline_viewer.js    | 10 +---------
 4 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/web/base_tree_viewer.js b/web/base_tree_viewer.js
index 579cd0147..2ba85aa0c 100644
--- a/web/base_tree_viewer.js
+++ b/web/base_tree_viewer.js
@@ -103,6 +103,20 @@ class BaseTreeViewer {
     this._toggleTreeItem(this.container, !this._lastToggleIsShow);
   }
 
+  /**
+   * @private
+   */
+  _finishRendering(fragment, count, hasAnyNesting = false) {
+    if (hasAnyNesting) {
+      this.container.classList.add("treeWithDeepNesting");
+
+      this._lastToggleIsShow = !fragment.querySelector(".treeItemsHidden");
+    }
+    this.container.appendChild(fragment);
+
+    this._dispatchEvent(count);
+  }
+
   render(params) {
     throw new Error("Not implemented: render");
   }
diff --git a/web/pdf_attachment_viewer.js b/web/pdf_attachment_viewer.js
index 6646830cd..0f15811ba 100644
--- a/web/pdf_attachment_viewer.js
+++ b/web/pdf_attachment_viewer.js
@@ -187,9 +187,7 @@ class PDFAttachmentViewer extends BaseTreeViewer {
       attachmentsCount++;
     }
 
-    this.container.appendChild(fragment);
-
-    this._dispatchEvent(attachmentsCount);
+    this._finishRendering(fragment, attachmentsCount);
   }
 
   /**
diff --git a/web/pdf_layer_viewer.js b/web/pdf_layer_viewer.js
index 83a917dcf..e1612cb87 100644
--- a/web/pdf_layer_viewer.js
+++ b/web/pdf_layer_viewer.js
@@ -174,16 +174,8 @@ class PDFLayerViewer extends BaseTreeViewer {
         levelData.parent.appendChild(div);
       }
     }
-    if (hasAnyNesting) {
-      this.container.classList.add("treeWithDeepNesting");
 
-      this._lastToggleIsShow =
-        fragment.querySelectorAll(".treeItemsHidden").length === 0;
-    }
-
-    this.container.appendChild(fragment);
-
-    this._dispatchEvent(layersCount);
+    this._finishRendering(fragment, layersCount, hasAnyNesting);
   }
 
   /**
diff --git a/web/pdf_outline_viewer.js b/web/pdf_outline_viewer.js
index 7d584564c..25420c4e2 100644
--- a/web/pdf_outline_viewer.js
+++ b/web/pdf_outline_viewer.js
@@ -171,16 +171,8 @@ class PDFOutlineViewer extends BaseTreeViewer {
         outlineCount++;
       }
     }
-    if (hasAnyNesting) {
-      this.container.classList.add("treeWithDeepNesting");
 
-      this._lastToggleIsShow =
-        fragment.querySelectorAll(".treeItemsHidden").length === 0;
-    }
-
-    this.container.appendChild(fragment);
-
-    this._dispatchEvent(outlineCount);
+    this._finishRendering(fragment, outlineCount, hasAnyNesting);
   }
 }