diff options
| author | Samy Pessé <samypesse@gmail.com> | 2014-04-06 17:06:01 -0700 |
|---|---|---|
| committer | Samy Pessé <samypesse@gmail.com> | 2014-04-06 17:06:01 -0700 |
| commit | 536c48096938ef141fdf4351739f8362e80641da (patch) | |
| tree | a53b74da69d10db8e6e1a9485c3127c76f4f6207 | |
| parent | d14bd7245f704205e06d25db9a3b614ca3b11930 (diff) | |
| download | gitbook-536c48096938ef141fdf4351739f8362e80641da.zip gitbook-536c48096938ef141fdf4351739f8362e80641da.tar.gz gitbook-536c48096938ef141fdf4351739f8362e80641da.tar.bz2 | |
Fix loading of search index in sub directories
| -rw-r--r-- | theme/assets/app.js | 6 | ||||
| -rw-r--r-- | theme/javascript/core/search.js | 2 | ||||
| -rw-r--r-- | theme/javascript/core/sidebar.js | 1 | ||||
| -rw-r--r-- | theme/javascript/core/state.js | 3 | ||||
| -rw-r--r-- | theme/templates/site.html | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/theme/assets/app.js b/theme/assets/app.js index 6efa9c0..ec6285f 100644 --- a/theme/assets/app.js +++ b/theme/assets/app.js @@ -18088,7 +18088,8 @@ define('core/state',[ '$book': $book, 'githubId': $book.data("github"), - 'level': $book.data("level") + 'level': $book.data("level"), + 'basePath': $book.data("basepath") }; }); /*global define:false */ @@ -19107,7 +19108,6 @@ define('core/sidebar',[ // Filter summary with a list of path var filterSummary = function(paths) { - console.log("filter with", paths); $summary.find("li").each(function() { var path = $(this).data("path"); var st = paths == null || _.contains(paths, path); @@ -21018,7 +21018,7 @@ define('core/search',[ // Load complete index var loadIndex = function() { - return $.getJSON("search_index.json") + return $.getJSON(state.basePath+"/search_index.json") .then(function(data) { index = lunr.Index.load(data); }); diff --git a/theme/javascript/core/search.js b/theme/javascript/core/search.js index 0aca997..a5399d9 100644 --- a/theme/javascript/core/search.js +++ b/theme/javascript/core/search.js @@ -11,7 +11,7 @@ define([ // Load complete index var loadIndex = function() { - return $.getJSON("search_index.json") + return $.getJSON(state.basePath+"/search_index.json") .then(function(data) { index = lunr.Index.load(data); }); diff --git a/theme/javascript/core/sidebar.js b/theme/javascript/core/sidebar.js index ab5b19a..d318676 100644 --- a/theme/javascript/core/sidebar.js +++ b/theme/javascript/core/sidebar.js @@ -38,7 +38,6 @@ define([ // Filter summary with a list of path var filterSummary = function(paths) { - console.log("filter with", paths); $summary.find("li").each(function() { var path = $(this).data("path"); var st = paths == null || _.contains(paths, path); diff --git a/theme/javascript/core/state.js b/theme/javascript/core/state.js index b219f5d..5ed11e8 100644 --- a/theme/javascript/core/state.js +++ b/theme/javascript/core/state.js @@ -7,6 +7,7 @@ define([ '$book': $book, 'githubId': $book.data("github"), - 'level': $book.data("level") + 'level': $book.data("level"), + 'basePath': $book.data("basepath") }; });
\ No newline at end of file diff --git a/theme/templates/site.html b/theme/templates/site.html index 42fa667..5bb3c8b 100644 --- a/theme/templates/site.html +++ b/theme/templates/site.html @@ -2,7 +2,7 @@ {% block title %}{{ progress.current.title }}{% parent %}{% endblock %} {% block content %} -<div class="book" data-github="{{ githubId }}" data-level="{{ progress.current.level }}"> +<div class="book" data-github="{{ githubId }}" data-level="{{ progress.current.level }}" data-basepath="{{ basePath }}"> {% include "includes/book/header.html" %} {% include "includes/book/summary.html" %} <div class="book-body" tabindex="-1"> |