From 754bca2c6f732923f9fcce7b953dcd5f6b464c1b Mon Sep 17 00:00:00 2001
From: Eduard Urbach <e.urbach@gmail.com>
Date: Fri, 16 Mar 2018 19:39:48 +0100
Subject: [PATCH] Heavily improved search

---
 scripts/AnimeNotifier.ts | 54 ++++++++++++++++++++++++++--------------
 scripts/MutationQueue.ts | 12 +++++++--
 2 files changed, 46 insertions(+), 20 deletions(-)

diff --git a/scripts/AnimeNotifier.ts b/scripts/AnimeNotifier.ts
index a01bb9af..f6918447 100644
--- a/scripts/AnimeNotifier.ts
+++ b/scripts/AnimeNotifier.ts
@@ -32,6 +32,7 @@ export class AnimeNotifier {
 	infiniteScroller: InfiniteScroller
 	mainPageLoaded: boolean
 	isLoading: boolean
+	diffCompletedForCurrentPath: boolean
 	lastReloadContentPath: string
 	currentSoundTrackId: string
 
@@ -665,31 +666,48 @@ export class AnimeNotifier {
 		}
 	}
 
-	diff(url: string) {
+	async diff(url: string) {
 		if(url === this.app.currentPath) {
-			return Promise.reject(null)
+			return null
 		}
 
 		let path = "/_" + url
-		let request = this.app.get(path)
 
-		// let request = fetch(path, {
-		// 	credentials: "same-origin"
-		// })
-		// .then(response => response.text())
+		try {
+			// Start the request
+			let request = fetch(path, {
+				credentials: "same-origin"
+			})
+			.then(response => response.text())
 
-		history.pushState(url, null, url)
-		this.app.currentPath = url
-		this.app.markActiveLinks()
-		this.unmountMountables()
-		this.loading(true)
+			history.pushState(url, null, url)
+			this.app.currentPath = url
+			this.diffCompletedForCurrentPath = false
+			this.app.markActiveLinks()
+			this.unmountMountables()
+			this.loading(true)
 
-		// Delay by transition-speed
-		return delay(150).then(() => request)
-		.then(html => Diff.innerHTML(this.app.content, html))
-		.then(() => this.app.emit("DOMContentLoaded"))
-		.then(() => this.loading(false))
-		.catch(console.error)
+			// Delay by transition-speed
+			await delay(150)
+
+			let html = await request
+
+			// If the response for the correct path has not arrived yet, show this response
+			if(!this.diffCompletedForCurrentPath) {
+				// If this response was the most recently requested one, mark the requests as completed
+				if(this.app.currentPath === url) {
+					this.diffCompletedForCurrentPath = true
+				}
+
+				// Update contents
+				await Diff.innerHTML(this.app.content, html)
+				this.app.emit("DOMContentLoaded")
+			}
+		} catch(err) {
+			console.error(err)
+		} finally {
+			this.loading(false)
+		}
 	}
 
 	post(url: string, body: any) {
diff --git a/scripts/MutationQueue.ts b/scripts/MutationQueue.ts
index a8385f29..ed42e25e 100644
--- a/scripts/MutationQueue.ts
+++ b/scripts/MutationQueue.ts
@@ -28,7 +28,11 @@ export class MutationQueue {
 				return
 			}
 
-			this.mutation(this.elements[i])
+			try {
+				this.mutation(this.elements[i])
+			} catch(err) {
+				console.error(err)
+			}
 		}
 
 		this.clear()
@@ -66,7 +70,11 @@ export class CustomMutationQueue {
 				return
 			}
 
-			this.mutations[i]()
+			try {
+				this.mutations[i]()
+			} catch(err) {
+				console.error(err)
+			}
 		}
 
 		this.clear()