Fixups.

lgarron · lgarron · commit fcff3982149b · 2022-10-27T18:07:55.000-07:00
diff --git a/src/index.ts b/src/index.ts
@@ -129,10 +129,10 @@ export default class IncludeFragmentElement extends HTMLElement {
   )
 
   async #handleData(): Promise<void> {
-    if (this.#busy) return Promise.resolve()
+    if (this.#busy) return
     this.#busy = true
+    this.#observer.unobserve(this)
     try {
-      this.#observer.unobserve(this)
       const html = await this.#getData()
 
       const template = document.createElement('template')
@@ -142,9 +142,7 @@ export default class IncludeFragmentElement extends HTMLElement {
       const canceled = !this.dispatchEvent(
         new CustomEvent('include-fragment-replace', {cancelable: true, detail: {fragment}})
       )
-      if (canceled) {
-        return
-      }
+      if (canceled) return
       this.replaceWith(fragment)
       this.dispatchEvent(new CustomEvent('include-fragment-replaced'))
     } catch (_) {
@@ -181,28 +179,28 @@ export default class IncludeFragmentElement extends HTMLElement {
     // which states events must be dispatched after "queue a task".
     // https://www.w3.org/TR/html52/semantics-embedded-content.html#the-img-element
 
-    try {
-      await this.#task(['loadstart'])
-      const response = await this.fetch(this.request())
-      if (response.status !== 200) {
-        throw new Error(`Failed to load resource: the server responded with a status of ${response.status}`)
-      }
-      const ct = response.headers.get('Content-Type')
-      if (!isWildcard(this.accept) && (!ct || !ct.includes(this.accept ? this.accept : 'text/html'))) {
-        throw new Error(`Failed to load resource: expected ${this.accept || 'text/html'} but was ${ct}`)
-      }
-      const data = await response.text()
+    await this.#task(['loadstart'])
+    const response = await this.fetch(this.request())
+    if (response.status !== 200) {
+      throw new Error(`Failed to load resource: the server responded with a status of ${response.status}`)
+    }
+    const ct = response.headers.get('Content-Type')
+    if (!isWildcard(this.accept) && (!ct || !ct.includes(this.accept ? this.accept : 'text/html'))) {
+      throw new Error(`Failed to load resource: expected ${this.accept || 'text/html'} but was ${ct}`)
+    }
+    const data = await response.text()
 
+    try {
       // Dispatch `load` and `loadend` async to allow
       // the `load()` promise to resolve _before_ these
       // events are fired.
-      await this.#task(['load', 'loadend'])
+      this.#task(['load', 'loadend'])
       return data
     } catch (error) {
       // Dispatch `error` and `loadend` async to allow
       // the `load()` promise to resolve _before_ these
       // events are fired.
-      await this.#task(['error', 'loadend'])
+      this.#task(['error', 'loadend'])
       throw error
     }
   }
