Hoist <user-coms-dialog> to the root element.

Jigsaw-Code · Apr 8, 2024 · 0fc71fc · 0fc71fc
1 parent 36d69ca
commit 0fc71fc
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 15 deletions.
diff --git a/client/src/www/app/app.ts b/client/src/www/app/app.ts
@@ -439,7 +439,7 @@ export class App {
       console.error(`Failed to read auto-connect dialog status, assuming not dismissed: ${e}`);
     }
     if (!dismissed) {
-      this.rootEl.$.serversView.$.autoConnectDialog.show();
+      this.rootEl.$.autoConnectDialog.show();
     }
   }
 

diff --git a/client/src/www/ui_components/app-root.js b/client/src/www/ui_components/app-root.js
@@ -497,6 +497,14 @@ export class AppRoot extends mixinBehaviors([AppLocalizeBehavior], PolymerElemen
         root-path="[[rootPath]]"
         localize="[[localize]]"
       ></server-rename-dialog>
+
+      <user-comms-dialog
+        id="autoConnectDialog"
+        localize="[[localize]]"
+        title-localization-key="auto-connect-dialog-title"
+        detail-localization-key="auto-connect-dialog-detail"
+        fire-event-on-hide="AutoConnectDialogDismissed"
+      ></user-comms-dialog>
     `;
   }
 

diff --git a/client/src/www/views/servers_view/index.ts b/client/src/www/views/servers_view/index.ts
@@ -144,7 +144,7 @@ export class ServerList extends LitElement {
     return unsafeHTML(msg);
   }
 
-  private get renderMainContent(): TemplateResult {
+  render() {
     if (this.shouldShowZeroState) {
       return html`
         <button type="button" @click=${this.requestPromptAddServer}>
@@ -165,17 +165,4 @@ export class ServerList extends LitElement {
       `;
     }
   }
-
-  render() {
-    return html`
-      ${this.renderMainContent}
-      <user-comms-dialog
-        id="autoConnectDialog"
-        .localize=${this.localize}
-        title-localization-key="auto-connect-dialog-title"
-        detail-localization-key="auto-connect-dialog-detail"
-        fire-event-on-hide="AutoConnectDialogDismissed"
-      ></user-comms-dialog>
-    `;
-  }
 }