fix: sort pages in global computed properties

meteorlxy · May 21, 2019 · 246a48a · 246a48a
1 parent d417852
commit 246a48a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/lib/components/PostsList.vue b/lib/components/PostsList.vue
@@ -42,7 +42,6 @@
 </template>
 
 <script>
-import compareDesc from 'date-fns/compare_desc'
 import TransitionFadeSlide from './TransitionFadeSlide.vue'
 import PostsListItem from './PostsListItem.vue'
 import Pagination from './Pagination.vue'
@@ -80,19 +79,7 @@ export default {
     },
 
     listPosts () {
-      const allPosts = this.posts || this.$posts
-
-      const pageSort = (p1, p2) => {
-        if (p1.top === p2.top) {
-          return compareDesc(p1.createdAt, p2.createdAt)
-        }
-        if (p1.top && p2.top) {
-          return p1.top - p2.top
-        }
-        return p2.top ? 1 : -1
-      }
-
-      return allPosts.sort(pageSort)
+      return this.posts || this.$posts
     },
 
     pagePosts () {

diff --git a/lib/plugins/blog/enhanceApp.js b/lib/plugins/blog/enhanceApp.js
@@ -6,7 +6,15 @@ export default ({ Vue }) => {
       $posts () {
         const pages = this.$site.pages
         const pageFilter = p => p.type === 'post'
-        const pageSort = (p1, p2) => compareDesc(p1.createdAt, p2.createdAt)
+        const pageSort = (p1, p2) => {
+          if (p1.top === p2.top) {
+            return compareDesc(p1.createdAt, p2.createdAt)
+          }
+          if (p1.top && p2.top) {
+            return p1.top - p2.top
+          }
+          return p2.top ? 1 : -1
+        }
         const posts = pages.filter(pageFilter).sort(pageSort)
         return posts
       },