mixins/pagination: Reorder computed properties

This essentially orders them by dependencies, so that the ones that don't depend on others are at the top

Author: Turbo87

app/mixins/pagination.js

@@ -6,31 +6,9 @@ const VIEWABLE_PAGES = 9;
 
 // eslint-disable-next-line ember/no-new-mixins
 export default Mixin.create({
-  // Gives page numbers to the surrounding 9 pages.
-  pages: computed('currentPage', 'availablePages', function () {
-    let pages = [];
-    let currentPage = this.currentPage;
-    let availablePages = this.availablePages;
-    let lowerBound = 0;
-    let upperBound = 0;
-
-    // Always show the same number of pages even if we're
-    // at the beginning or at the end of the list.
-    if (availablePages - currentPage < Math.ceil(VIEWABLE_PAGES / 2)) {
-      lowerBound = Math.max(0, availablePages - VIEWABLE_PAGES);
-      upperBound = availablePages;
-    } else if (currentPage <= Math.ceil(VIEWABLE_PAGES / 2)) {
-      lowerBound = 0;
-      upperBound = Math.min(availablePages, VIEWABLE_PAGES);
-    } else {
-      lowerBound = currentPage - Math.ceil(VIEWABLE_PAGES / 2);
-      upperBound = currentPage + Math.floor(VIEWABLE_PAGES / 2);
-    }
-    for (let i = lowerBound; i < upperBound; i++) {
-      pages.push(i + 1);
-    }
-    return pages;
-  }),
+  // wire up these ember-style variables to the expected query parameters
+  itemsPerPage: readOnly('per_page'),
+  selectedPage: readOnly('page'),
 
   currentPage: computed('selectedPage', function () {
     return parseInt(this.selectedPage, 10) || 1;
@@ -47,6 +25,10 @@ export default Mixin.create({
     return Math.min(this.currentPage * this.itemsPerPage, this.totalItems);
   }),
 
+  availablePages: computed('totalItems', 'itemsPerPage', function () {
+    return Math.ceil(this.totalItems / this.itemsPerPage || 1);
+  }),
+
   nextPage: computed('currentPage', 'availablePages', function () {
     let nextPage = this.currentPage + 1;
     let availablePages = this.availablePages;
@@ -66,11 +48,29 @@ export default Mixin.create({
     }
   }),
 
-  availablePages: computed('totalItems', 'itemsPerPage', function () {
-    return Math.ceil(this.totalItems / this.itemsPerPage || 1);
-  }),
+  // Gives page numbers to the surrounding 9 pages.
+  pages: computed('currentPage', 'availablePages', function () {
+    let pages = [];
+    let currentPage = this.currentPage;
+    let availablePages = this.availablePages;
+    let lowerBound = 0;
+    let upperBound = 0;
 
-  // wire up these ember-style variables to the expected query parameters
-  itemsPerPage: readOnly('per_page'),
-  selectedPage: readOnly('page'),
+    // Always show the same number of pages even if we're
+    // at the beginning or at the end of the list.
+    if (availablePages - currentPage < Math.ceil(VIEWABLE_PAGES / 2)) {
+      lowerBound = Math.max(0, availablePages - VIEWABLE_PAGES);
+      upperBound = availablePages;
+    } else if (currentPage <= Math.ceil(VIEWABLE_PAGES / 2)) {
+      lowerBound = 0;
+      upperBound = Math.min(availablePages, VIEWABLE_PAGES);
+    } else {
+      lowerBound = currentPage - Math.ceil(VIEWABLE_PAGES / 2);
+      upperBound = currentPage + Math.floor(VIEWABLE_PAGES / 2);
+    }
+    for (let i = lowerBound; i < upperBound; i++) {
+      pages.push(i + 1);
+    }
+    return pages;
+  }),
 });