:recycle: simplifying singlee watcher | addressing #125

vue-theme/src/pages/single.vue

@@ -223,12 +223,8 @@ export default {
     watch: {
         slug(newSlug, oldSlug) {
             // ONLY load post data when navigating TO a single page
-            if(newSlug && !oldSlug) {
-                this._clearHero(this.$store)
-                this.loadPostData()
-            }
-            // ONLY load post data when navigating TO a single page from a single page
-            if(newSlug && oldSlug) {
+            // OR when navigating TO a single page from a single page
+            if(newSlug && !oldSlug || newSlug && oldSlug) {
                 this._clearHero(this.$store)
                 this.loadPostData()
             }

vue-theme/src/store/modules/artist.js

@@ -36,33 +36,24 @@ const _arrangeByMaterial = artistsList => {
     return flatPacked
 }
 
+let seenTitles = []
 const _arrangeByAlpha = artistsList => {
     const alphabet = [...'9abcdefghijklmnopqrstuvwxyz']
     const flatPacked = []
-    let seen = 0
-    let hasTitle = []
 
     const storeTitle = letter => {
-        if(hasTitle.includes(letter)) return
+        if(seenTitles.includes(letter)) return
         flatPacked.push({ slug: letter, title: letter, inbetween: true })
-        hasTitle.push(letter)
+        seenTitles.push(letter)
     }
 
-    artistsList.forEach((artist, i) => {
+    artistsList.forEach(artist => {
         const lastWord = artist.slug.split('-').filter(c => c).pop()
+        const firstCharaOflastWord = lastWord[0]
         const firstCharaOfSortWord = artist.sortname ? artist.sortname[0] : 'z'
-        const charaIndex = alphabet.indexOf(lastWord[0]) < alphabet.indexOf(firstCharaOfSortWord) ? alphabet.indexOf(lastWord[0]) : alphabet.indexOf(firstCharaOfSortWord)
-        
-        // The first artist you've seen in THIS BATCH
-        if(i == 0) {
-            seen = charaIndex
-            storeTitle(alphabet[seen])
-        }
-        if (charaIndex == seen + 1) {
-            seen++
-            if(seen > alphabet.length) seen = 0
-            storeTitle(alphabet[seen])
-        }
+        const charaIndex = alphabet.indexOf(firstCharaOflastWord) < alphabet.indexOf(firstCharaOfSortWord) ? alphabet.indexOf(firstCharaOflastWord) : alphabet.indexOf(firstCharaOfSortWord)
+
+        storeTitle(alphabet[charaIndex])
         flatPacked.push(artist)
     })
     return flatPacked