new element creation helper

2 files changed, 19 insertions, 19 deletions

diff --git a/client-web/source/resource/file.ts b/client-web/source/resource/file.ts
index 4deb1b6..701383b 100644
--- a/client-web/source/resource/file.ts
+++ b/client-web/source/resource/file.ts
@@ -5,7 +5,7 @@
 */
 /// <reference lib="dom" />
 
-import { display_filesize, ebutton, ediv, espan, sleep } from "../helper.ts";
+import { display_filesize, e, sleep } from "../helper.ts";
 import { log } from "../logger.ts";
 import { StreamDownload } from "../download_stream.ts";
 import { RemoteUser } from "../user/remote.ts";
@@ -16,17 +16,17 @@ const MAX_CHUNK_SIZE = 1 << 15;
 export const resource_file: ResourceHandlerDecl = {
     kind: "file",
     new_remote(info, user, enable) {
-        const download_button = ebutton("Download", {
+        const download_button = e("button", {
             onclick: self => {
                 enable()
                 self.textContent = "Downloading…"
                 self.disabled = true
             }
-        })
+        }, "Download")
         return {
             info,
-            el: ediv({},
-                espan(`File: ${JSON.stringify(info.label)} (${display_filesize(info.size!)})`),
+            el: e("div", {},
+                e("span", {}, `File: ${JSON.stringify(info.label)} (${display_filesize(info.size!)})`),
                 download_button,
             ),
             on_statechange(_s) { },
@@ -114,15 +114,15 @@ export function create_file_res(): Promise<LocalResource> {
 }
 
 function file_res_inner(file: File): LocalResource {
-    const transfers_el = ediv({})
+    const transfers_el = e("div", {})
     const transfers_abort = new Set<() => void>()
     return {
         info: { kind: "file", id: Math.random().toString(), label: file.name, size: file.size },
         destroy() {
             transfers_abort.forEach(abort => abort())
         },
-        el: ediv({ class: "file" },
-            espan(`Sharing file: ${JSON.stringify(file.name)}`),
+        el: e("div", { class: "file" },
+            e("span", {}, `Sharing file: ${JSON.stringify(file.name)}`),
             transfers_el
         ),
         on_request(user, create_channel) {
@@ -189,10 +189,10 @@ function file_res_inner(file: File): LocalResource {
 }
 
 function transfer_status_el(remote: RemoteUser) {
-    const status = espan("…")
-    const bar = ediv({ class: "progress-bar" });
+    const status = e("span", {}, "…")
+    const bar = e("div", { class: "progress-bar" });
     return {
-        el: ediv({ class: "transfer-status" }, status, bar),
+        el: e("div", { class: "transfer-status" }, status, bar),
         set status(s: string) {
             status.textContent = `${remote.display_name}: ${s}`
         },
diff --git a/client-web/source/resource/track.ts b/client-web/source/resource/track.ts
index 6c461b7..aa2643a 100644
--- a/client-web/source/resource/track.ts
+++ b/client-web/source/resource/track.ts
@@ -5,7 +5,7 @@
 */
 /// <reference lib="dom" />
 import { ProvideInfo } from "../../../common/packets.d.ts";
-import { ebutton, ediv, elabel } from "../helper.ts";
+import { e } from "../helper.ts";
 import { log } from "../logger.ts";
 import { on_pref_changed, PREFS } from "../preferences/mod.ts";
 import { get_rnnoise_node } from "../rnnoise.ts";
@@ -18,20 +18,20 @@ export const resource_track: ResourceHandlerDecl = {
         let enable_label = `Enable ${info.track_kind}`
         if (info.label) enable_label += ` "${info.label}"`
 
-        const enable_button = ebutton(enable_label, {
+        const enable_button = e("button", {
             onclick: self => {
                 self.disabled = true;
                 self.textContent = "Awaiting track…";
                 enable()
             }
-        })
+        }, enable_label)
         return {
             info,
-            el: ediv({}, enable_button),
+            el: e("div", {}, enable_button),
             on_statechange() { },
             on_enable(track, disable) {
                 this.el.removeChild(enable_button)
-                this.el.append(ebutton("Disable", {
+                this.el.append(e("button", {
                     onclick: (self) => {
                         disable()
                         this.el.appendChild(enable_button)
@@ -40,7 +40,7 @@ export const resource_track: ResourceHandlerDecl = {
                         enable_button.textContent = enable_label;
                         self.remove()
                     }
-                }))
+                }), "Disable")
                 if (!(track instanceof TrackHandle)) return console.warn("aservuoivasretuoip");
                 this.el.append(create_track_display(track))
             }
@@ -51,7 +51,7 @@ export const resource_track: ResourceHandlerDecl = {
 export function new_local_track(info: ProvideInfo, track: TrackHandle, ...extra_controls: HTMLElement[]): LocalResource {
     return {
         info,
-        el: ediv({},
+        el: e("div", {},
             create_track_display(track),
             ...extra_controls
         ),
@@ -181,7 +181,7 @@ export async function create_mic_res() {
         if (mute.checked) gain.gain.value = Number.MIN_VALUE
         else gain.gain.value = PREFS.microphone_gain
     }
-    const mute_label = elabel("Mute", { class: "check-button" })
+    const mute_label = e("label", { class: "check-button" }, "Mute")
     mute_label.prepend(mute)
 
     return new_local_track({ id: t.id, kind: "track", track_kind: "audio", label: "Microphone" }, t, mute_label)