From 15bba899c326a30d21fd7d1bdbaec4afe44e47f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Sun, 12 Jun 2022 03:25:56 +0200 Subject: Replace some .tagName with instanceof. --- static/components/tab-group-element.ts | 2 +- static/components/vevent.ts | 1 - static/globals.ts | 4 ++-- static/server_connect.ts | 3 ++- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/static/components/tab-group-element.ts b/static/components/tab-group-element.ts index 5cfeab2d..e90997e9 100644 --- a/static/components/tab-group-element.ts +++ b/static/components/tab-group-element.ts @@ -174,7 +174,7 @@ class TabGroupElement extends ComponentVEvent { /* returns our rrule tab if we have one */ has_rrule_tab(): Element | false { for (let child of this.children) { - if ((child.firstChild! as HTMLElement).tagName.toLowerCase() === 'vevent-edit-rrule') { + if (child.firstChild! instanceof EditRRule) { return child; } } diff --git a/static/components/vevent.ts b/static/components/vevent.ts index 2193eabc..5852a2ff 100644 --- a/static/components/vevent.ts +++ b/static/components/vevent.ts @@ -19,7 +19,6 @@ abstract class ComponentVEvent extends HTMLElement { let real_uid; - // console.log(this.tagName); if (uid) { // console.log('Got UID directly'); real_uid = uid; diff --git a/static/globals.ts b/static/globals.ts index ddc9113e..d90a3681 100644 --- a/static/globals.ts +++ b/static/globals.ts @@ -51,8 +51,8 @@ function find_block(uid: uid): ComponentBlock | null { return null; } for (let el of obj.registered) { - if (el.tagName.toLowerCase() === 'vevent-block') { - return el as ComponentBlock; + if (el instanceof ComponentBlock) { + return el; } } // throw 'Popup not fonud'; diff --git a/static/server_connect.ts b/static/server_connect.ts index 61eb4f30..d1a544eb 100644 --- a/static/server_connect.ts +++ b/static/server_connect.ts @@ -4,6 +4,7 @@ import { jcal_to_xcal } from './jcal' import { VEvent } from './vevent' import { uid } from './types' import { vcal_objects } from './globals' +import { PopupElement } from './components/popup-element' async function remove_event(uid: uid) { let element = vcal_objects.get(uid); @@ -124,7 +125,7 @@ async function create_event(event: VEvent) { for (let r of event.registered) { r.classList.remove('generated'); - if (r.tagName.toLowerCase() === 'popup-element') { + if (r instanceof PopupElement) { console.log(r); r.removeAttribute('visible'); } -- cgit v1.2.3