summaryrefslogtreecommitdiffstats
path: root/lib/utils
diff options
context:
space:
mode:
authorSamy Pessé <samypesse@gmail.com>2015-03-17 11:22:56 +0100
committerSamy Pessé <samypesse@gmail.com>2015-03-17 11:22:56 +0100
commit15ebae8cb1a89e09cadd60639346f6b754ff7c06 (patch)
treebbc9b03382b864eb4939a3906068cf1b8b9e145b /lib/utils
parent315556310fa6afd4cb77e0612ff661ff4fd1f60c (diff)
downloadgitbook-15ebae8cb1a89e09cadd60639346f6b754ff7c06.zip
gitbook-15ebae8cb1a89e09cadd60639346f6b754ff7c06.tar.gz
gitbook-15ebae8cb1a89e09cadd60639346f6b754ff7c06.tar.bz2
Fix #641: fix progress order in json format
Diffstat (limited to 'lib/utils')
-rw-r--r--lib/utils/navigation.js1
-rw-r--r--lib/utils/progress.js8
2 files changed, 9 insertions, 0 deletions
diff --git a/lib/utils/navigation.js b/lib/utils/navigation.js
index 21666ad..6912b14 100644
--- a/lib/utils/navigation.js
+++ b/lib/utils/navigation.js
@@ -57,6 +57,7 @@ function navigation(summary, files) {
return [current.path, {
+ index: i,
title: current.title,
prev: prev,
next: next,
diff --git a/lib/utils/progress.js b/lib/utils/progress.js
index b66aea9..9669d86 100644
--- a/lib/utils/progress.js
+++ b/lib/utils/progress.js
@@ -7,10 +7,18 @@ var calculProgress = function(navigation, current) {
var done = true;
var chapters = _.chain(navigation)
+
+ // Transform as array
.map(function(nav, path) {
nav.path = path;
return nav;
})
+
+ // Sort entries
+ .sortBy(function(nav) {
+ return nav.index;
+ })
+
.map(function(nav, i) {
// Calcul percent
nav.percent = (i * 100) / Math.max((n - 1), 1);