diff options
| author | Johan Preynat <johan.preynat@gmail.com> | 2016-05-28 11:56:34 +0200 |
|---|---|---|
| committer | Johan Preynat <johan.preynat@gmail.com> | 2016-05-28 11:56:34 +0200 |
| commit | 33406c308208210cfc94a25d1d5975aad6e3f557 (patch) | |
| tree | f1bb28c1c7c765ea0653c5c2c56443a7eb4d6c2d /lib/plugins/loadForBook.js | |
| parent | ebe845d46c9e3378a504f9b05c71ea361e36b599 (diff) | |
| parent | c3851889b0eba506c3138daaf4f1ef583dd608db (diff) | |
| download | gitbook-33406c308208210cfc94a25d1d5975aad6e3f557.zip gitbook-33406c308208210cfc94a25d1d5975aad6e3f557.tar.gz gitbook-33406c308208210cfc94a25d1d5975aad6e3f557.tar.bz2 | |
Merge pull request #1336 from GitbookIO/loading/themes
Load plugins before themes
Diffstat (limited to 'lib/plugins/loadForBook.js')
| -rw-r--r-- | lib/plugins/loadForBook.js | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/plugins/loadForBook.js b/lib/plugins/loadForBook.js index c4acb5f..fd45a77 100644 --- a/lib/plugins/loadForBook.js +++ b/lib/plugins/loadForBook.js @@ -3,6 +3,7 @@ var Promise = require('../utils/promise'); var listForBook = require('./listForBook'); var findForBook = require('./findForBook'); var loadPlugin = require('./loadPlugin'); +var sortPlugins = require('./sortPlugins'); /** @@ -27,11 +28,9 @@ function loadForBook(book) { ); }); - // Sort plugins to match list in book.json - installed = installed.sort(function(a, b){ - return requirementsKeys.indexOf(a.getName()) < requirementsKeys.indexOf(b.getName()) ? -1 : 1; - }); - + return sortPlugins(installed, requirementsKeys); + }) + .then(function(installed) { // Log state logger.info.ln(installed.size + ' plugins are installed'); if (requirements.size != installed.size) { |