improving history management in middleware/main/mono

Lcfvs · Jan 25, 2019 · 37fd3aa · 37fd3aa
1 parent 6bdee1e
commit 37fd3aa
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/middleware/main/mono/index.js b/middleware/main/mono/index.js
@@ -9,6 +9,10 @@ const window = global()
 const history = create()
 history.entries = create()
 
+function cleanHref (href) {
+  return href.toString().split('#')[0]
+}
+
 function getTitle (element) {
   return text(one('h1', element)).trim()
 }
@@ -24,18 +28,19 @@ function updateTitle (element) {
 function listen () {
   const main = one('main')
 
-  register(main, window.location.href)
+  register(main, cleanHref(window.location.href))
   window.addEventListener('popstate', onPopState)
   history.branding = window.document.title.trim()
     .replace(getTitle(main), '$1')
 }
 
 function onPopState (event) {
-  const main = history.entries[event.target.location.href]
+  const registered = history.entries[cleanHref(event.target.location.href)]
+  const current = one('main')
 
-  if (main) {
-    updateTitle(main)
-    replace(main, one('main'))
+  if (registered && registered !== current) {
+    updateTitle(registered)
+    replace(registered, current)
   }
 }
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "anticore",
-  "version": "2.23.1",
+  "version": "2.23.2",
   "description": "A generic living DOM library to simplify your client code, like with its easiest middleware manager for AJAX requests.",
   "main": "index.js",
   "module": "index.js",