Merge branch 'master' of https://github.com/evil-shrike/grunt-assemble …

…into evil-shrike-master
assemble · Sep 6, 2016 · 0700e4a · 0700e4a
2 parents cb833ce + e6e1523
commit 0700e4a
Showing 1 changed file with 23 additions and 20 deletions.
diff --git a/lib/collection.js b/lib/collection.js
@@ -46,6 +46,27 @@ collection.update = function(col, page, context) {
   return col;
 };
 
+function compare (a, b) {
+
+  if(a && b) {
+    if(a < b) {
+      return -1;
+    } else if (a > b) {
+      return 1;
+    } else {
+      return 0;
+    }
+  } else {
+    // pages without {sortby} field will at the end of collection
+    if (!a && !b) { 
+      return 0; 
+    }
+    if (!a) { 
+      return 1; 
+    }
+    return -1;
+  }
+}
 
 collection.sort = function(col) {
   'use strict';
@@ -60,15 +81,7 @@ collection.sort = function(col) {
 
     // sort items by the actual item
     col.items.sort(function(a, b) {
-      if(a[col.inflection] && b[col.inflection]) {
-        if(a[col.inflection] < b[col.inflection]) {
-          return -1;
-        } else if (a[col.inflection] > b[col.inflection]) {
-          return 1;
-        } else {
-          return 0;
-        }
-      }
+      return compare(a[col.inflection], b[col.inflection]);
     });
 
     if(sortorder !== 'ASC') {
@@ -81,17 +94,7 @@ collection.sort = function(col) {
     col.items.forEach(function(item) {
 
       item.pages.sort(function(a, b) {
-        if(a.data[sortby] && b.data[sortby]) {
-          if(a.data[sortby] < b.data[sortby]) {
-            return -1;
-          } else if (a.data[sortby] > b.data[sortby]) {
-            return 1;
-          } else {
-            return 0;
-          }
-        } else {
-          return 0;
-        }
+        return compare(a.data[sortby], b.data[sortby]);
       });
 
       if(sortorder !== 'ASC') {