feat: Adds firstPageUrlTemplate option (#40)

* [FEATURE] Adds firstPageUrlTemplate option * Forgot to compute previousUrl as well * Renames baseUrlTemplate to firstPageUrlTemplate * Fix hardcoded firstPage as 1 * Updates firstUrl to use firstPageUrlTemplate
knownasilya · Sep 28, 2017 · 8cf402b · 8cf402b
1 parent 5f61dd8
commit 8cf402b
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 1 deletion.
diff --git a/addon/components/page-item.js b/addon/components/page-item.js
@@ -11,6 +11,12 @@ export default Ember.Component.extend({
   url: computed('urlTemplate', 'page', function () {
     var urlTemplate = this.get('urlTemplate');
     var current = this.get('page');
+    var firstPage = this.get('firstPage');
+    var firstPageUrlTemplate = this.get('firstPageUrlTemplate');
+
+    if(firstPageUrlTemplate && (current === firstPage)){
+      return firstPageUrlTemplate;
+    }
 
     urlTemplate = urlTemplate.replace('{current}', current);
 

diff --git a/addon/components/pagination-pager.js b/addon/components/pagination-pager.js
@@ -21,12 +21,18 @@ export default Ember.Component.extend({
   firstPage: 1,
   current: 1,
   urlTemplate: '#',
+  firstPageUrlTemplate: null,
   lastPage: alias('count'),
 
   previousUrl: computed('urlTemplate', 'current', 'firstPage', function () {
     var urlTemplate = this.get('urlTemplate');
     var current = this.get('current');
     var firstPage = this.get('firstPage');
+    var firstPageUrlTemplate = this.get('firstPageUrlTemplate');
+
+    if(firstPageUrlTemplate && (((current - 1) === firstPage) || current === firstPage)) {
+      return firstPageUrlTemplate;
+    }
 
     urlTemplate = urlTemplate.replace('{current}', current > firstPage ? current - 1 : current);
 
@@ -46,6 +52,11 @@ export default Ember.Component.extend({
   firstUrl: computed('urlTemplate', 'current', 'firstPage', function () {
     var urlTemplate = this.get('urlTemplate');
     var firstPage = this.get('firstPage');
+    var firstPageUrlTemplate = this.get('firstPageUrlTemplate');
+
+    if(firstPageUrlTemplate) {
+      return firstPageUrlTemplate;
+    }
 
     urlTemplate = urlTemplate.replace('{current}', firstPage);
 

diff --git a/app/templates/components/pagination-pager.hbs b/app/templates/components/pagination-pager.hbs
@@ -5,7 +5,16 @@
     </li>
 
     {{#each pages key="@index" as |page|}}
-      {{page-item disabled=disabled page=page selected=this.current seperator=seperator urlTemplate=urlTemplate pageSet='pageChanged'}}
+      {{page-item
+        disabled=disabled
+        page=page
+        selected=this.current
+        seperator=seperator
+        urlTemplate=urlTemplate
+        firstPage=firstPage
+        firstPageUrlTemplate=firstPageUrlTemplate
+        pageSet='pageChanged'
+      }}
     {{/each}}
 
     <li class="next {{if isLastDisabled 'disabled'}}">