@tenjuu99/blog 0.2.34 → 0.2.36

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tenjuu99/blog",
-  "version": "0.2.34",
+  "version": "0.2.36",
   "description": "blog template",
   "main": "index.js",
   "scripts": {

package/packages/turbolink/template/turbolink.js

@@ -20,10 +20,16 @@ const transition = async (href) => {
   // load style
   const styleInline = [...document.styleSheets].filter(s => !s.href)
   const newStyleInline = [...doc.getElementsByTagName('style')].filter(s => s.dataset.styleName)
-  newStyleInline.forEach(s => {
-    const name = s.dataset.styleName
-    if (!styleInline.find(si => si.ownerNode.dataset.styleName === name)) {
-      document.head.appendChild(s)
+  styleInline.forEach(style => {
+    const exist = newStyleInline.find(ns => ns.dataset.styleName === style.ownerNode.dataset.styleName)
+    if (!exist) {
+      style.ownerNode.remove()
+    }
+  })
+  newStyleInline.forEach(style => {
+    const exist = styleInline.find(s => s.ownerNode.dataset.styleName === style.dataset.styleName)
+    if (!exist) {
+      document.head.appendChild(style)
     }
   })
   window.scroll({top: 0, left: 0, behavior: 'instant'})
@@ -73,9 +79,6 @@ const transition = async (href) => {
       script.remove()
     }
   })
-  for (let k in window.after_transition) {
-    window.after_transition[k].apply()
-  }
 }
 
 const urlFromHref = (href) => {
@@ -102,7 +105,13 @@ const turbolinks = () => {
         if (`${url.pathname}${url.search}` === `${current.pathname}${current.search}`) {
           return;
         }
+        for (let k in window.turbolink_before_transition) {
+          window.turbolink_before_transition[k].apply()
+        }
         await transition(href)
+        for (let k in window.turbolink_after_transition) {
+          window.turbolink_after_transition[k].apply()
+        }
         history.pushState({}, '', href)
         turbolinks()
       }