webview: Use private methods.

Signed-off-by: Anders Kaseorg <[email protected]>

Author: andersk

app/renderer/js/components/webview.ts

@@ -117,7 +117,88 @@ export default class WebView {
     return remote.webContents.fromId(this.webContentsId);
   }
 
-  registerListeners(): void {
+  showNotificationSettings(): void {
+    this.send("show-notification-settings");
+  }
+
+  focus(): void {
+    this.$webview.focus();
+    // Work around https://github.com/electron/electron/issues/31918
+    this.$webview.shadowRoot?.querySelector("iframe")?.focus();
+  }
+
+  hide(): void {
+    this.$webview.classList.remove("active");
+  }
+
+  load(): void {
+    this.show();
+  }
+
+  zoomIn(): void {
+    this.zoomFactor += 0.1;
+    this.getWebContents().setZoomFactor(this.zoomFactor);
+  }
+
+  zoomOut(): void {
+    this.zoomFactor -= 0.1;
+    this.getWebContents().setZoomFactor(this.zoomFactor);
+  }
+
+  zoomActualSize(): void {
+    this.zoomFactor = 1;
+    this.getWebContents().setZoomFactor(this.zoomFactor);
+  }
+
+  logOut(): void {
+    this.send("logout");
+  }
+
+  showKeyboardShortcuts(): void {
+    this.send("show-keyboard-shortcuts");
+  }
+
+  openDevTools(): void {
+    this.getWebContents().openDevTools();
+  }
+
+  back(): void {
+    if (this.getWebContents().canGoBack()) {
+      this.getWebContents().goBack();
+      this.focus();
+    }
+  }
+
+  canGoBackButton(): void {
+    const $backButton = document.querySelector(
+      "#actions-container #back-action",
+    )!;
+    $backButton.classList.toggle("disable", !this.getWebContents().canGoBack());
+  }
+
+  forward(): void {
+    if (this.getWebContents().canGoForward()) {
+      this.getWebContents().goForward();
+    }
+  }
+
+  reload(): void {
+    this.hide();
+    // Shows the loading indicator till the webview is reloaded
+    this.$webviewsContainer.remove("loaded");
+    this.loading = true;
+    this.props.switchLoading(true, this.props.url);
+    this.getWebContents().reload();
+  }
+
+  send<Channel extends keyof RendererMessage>(
+    channel: Channel,
+    ...args: Parameters<RendererMessage[Channel]>
+  ): void {
+    ipcRenderer.sendTo(this.webContentsId, channel, ...args);
+  }
+
+  private registerListeners(): void {
     const webContents = this.getWebContents();
 
     if (shouldSilentWebview) {
@@ -183,16 +264,12 @@ export default class WebView {
     });
   }
 
-  getBadgeCount(title: string): number {
+  private getBadgeCount(title: string): number {
     const messageCountInTitle = /^\((\d+)\)/.exec(title);
     return messageCountInTitle ? Number(messageCountInTitle[1]) : 0;
   }
 
-  showNotificationSettings(): void {
-    this.send("show-notification-settings");
-  }
-
-  show(): void {
+  private show(): void {
     // Do not show WebView if another tab was selected and this tab should be in background.
     if (!this.props.isActive()) {
       return;
@@ -224,81 +301,4 @@ export default class WebView {
         this.getWebContents().insertCSS(fs.readFileSync(customCss, "utf8")))();
     }
   }
-
-  focus(): void {
-    this.$webview.focus();
-    // Work around https://github.com/electron/electron/issues/31918
-    this.$webview.shadowRoot?.querySelector("iframe")?.focus();
-  }
-
-  hide(): void {
-    this.$webview.classList.remove("active");
-  }
-
-  load(): void {
-    this.show();
-  }
-
-  zoomIn(): void {
-    this.zoomFactor += 0.1;
-    this.getWebContents().setZoomFactor(this.zoomFactor);
-  }
-
-  zoomOut(): void {
-    this.zoomFactor -= 0.1;
-    this.getWebContents().setZoomFactor(this.zoomFactor);
-  }
-
-  zoomActualSize(): void {
-    this.zoomFactor = 1;
-    this.getWebContents().setZoomFactor(this.zoomFactor);
-  }
-
-  logOut(): void {
-    this.send("logout");
-  }
-
-  showKeyboardShortcuts(): void {
-    this.send("show-keyboard-shortcuts");
-  }
-
-  openDevTools(): void {
-    this.getWebContents().openDevTools();
-  }
-
-  back(): void {
-    if (this.getWebContents().canGoBack()) {
-      this.getWebContents().goBack();
-      this.focus();
-    }
-  }
-
-  canGoBackButton(): void {
-    const $backButton = document.querySelector(
-      "#actions-container #back-action",
-    )!;
-    $backButton.classList.toggle("disable", !this.getWebContents().canGoBack());
-  }
-
-  forward(): void {
-    if (this.getWebContents().canGoForward()) {
-      this.getWebContents().goForward();
-    }
-  }
-
-  reload(): void {
-    this.hide();
-    // Shows the loading indicator till the webview is reloaded
-    this.$webviewsContainer.remove("loaded");
-    this.loading = true;
-    this.props.switchLoading(true, this.props.url);
-    this.getWebContents().reload();
-  }
-
-  send<Channel extends keyof RendererMessage>(
-    channel: Channel,
-    ...args: Parameters<RendererMessage[Channel]>
-  ): void {
-    ipcRenderer.sendTo(this.webContentsId, channel, ...args);
-  }
 }