Load site data asynchronously (#621)

MarkBind · Feb 4, 2019 · 75dbcf5 · 75dbcf5
1 parent e66010c
commit 75dbcf5
Show file tree

Hide file tree

Showing 14 changed files with 47 additions and 18 deletions.
diff --git a/asset/js/setup.js b/asset/js/setup.js
@@ -36,6 +36,15 @@ function setupAnchors() {
 function removeLoadingOverlay() {
   jQuery('#loading-overlay').remove();
 }
+
+function updateSearchData(vm) {
+  jQuery.getJSON(`${baseUrl}/siteData.json`)
+    .then((siteData) => {
+      // eslint-disable-next-line no-param-reassign
+      vm.searchData = siteData.pages;
+    });
+}
+
 function executeAfterMountedRoutines() {
   flattenModals();
   scrollToUrlAnchorHeading();
@@ -84,11 +93,7 @@ function setup() {
   setupPageNav();
 }
 
-function setupWithSearch(siteData) {
-  if (!siteData.enableSearch) {
-    setup();
-    return;
-  }
+function setupWithSearch() {
   const { searchbar } = VueStrap.components;
   // eslint-disable-next-line no-unused-vars
   const vm = new Vue({
@@ -98,7 +103,7 @@ function setupWithSearch(siteData) {
     },
     data() {
       return {
-        searchData: siteData.pages,
+        searchData: [],
       };
     },
     methods: {
@@ -110,12 +115,15 @@ function setupWithSearch(siteData) {
     },
     mounted() {
       executeAfterMountedRoutines();
+      updateSearchData(this);
     },
   });
   setupSiteNav();
   setupPageNav();
 }
 
-jQuery.getJSON(`${baseUrl}/siteData.json`)
-  .then(siteData => setupWithSearch(siteData))
-  .catch(() => setup());
+if (enableSearch) {
+  setupWithSearch();
+} else {
+  setup();
+}
diff --git a/src/Page.js b/src/Page.js
@@ -60,6 +60,7 @@ function Page(pageConfig) {
   this.layout = pageConfig.layout;
   this.layoutsAssetPath = pageConfig.layoutsAssetPath;
   this.rootPath = pageConfig.rootPath;
+  this.enableSearch = pageConfig.enableSearch;
   this.searchable = pageConfig.searchable;
   this.src = pageConfig.src;
   this.tags = pageConfig.tags;
@@ -234,6 +235,7 @@ Page.prototype.prepareTemplateData = function () {
     pageNav: this.isPageNavigationSpecifierValid(),
     siteNav: this.frontMatter.siteNav,
     title: prefixedTitle,
+    enableSearch: this.enableSearch,
   };
 };
 

diff --git a/src/Site.js b/src/Site.js
@@ -313,6 +313,7 @@ Site.prototype.createPage = function (config) {
     tags: this.siteConfig.tags,
     pageTemplate: this.pageTemplate,
     rootPath: this.rootPath,
+    enableSearch: this.siteConfig.enableSearch,
     searchable: this.siteConfig.enableSearch && config.searchable,
     src: config.pageSrc,
     layoutsAssetPath: path.relative(path.dirname(resultPath),

diff --git a/src/template/page.ejs b/src/template/page.ejs
@@ -38,6 +38,7 @@
 <script src="<%- asset.bootstrapVueJs %>"></script>
 <script>
     const baseUrl = '<%- baseUrl %>'
+    const enableSearch = <%- enableSearch %>
 </script>
 <script src="<%- asset.setup %>"></script>
 <% if (asset.externalScripts) { -%>

diff --git a/test/functional/test_site/expected/bugs/index.html b/test/functional/test_site/expected/bugs/index.html
@@ -97,6 +97,7 @@ <h2 id="remove-extra-space-in-links">Remove extra space in links<a class="fa fa-
 <script src="../markbind/js/bootstrap-vue.min.js"></script>
 <script>
     const baseUrl = '/test_site'
+    const enableSearch = true
 </script>
 <script src="../markbind/js/setup.js"></script>
 <script src="../markbind/layouts/default/scripts.js"></script>

diff --git a/test/functional/test_site/expected/index.html b/test/functional/test_site/expected/index.html
@@ -479,6 +479,7 @@ <h1 id="heading-in-footer-should-not-be-indexed">Heading in footer should not be
 <script src="markbind/js/bootstrap-vue.min.js"></script>
 <script>
     const baseUrl = '/test_site'
+    const enableSearch = true
 </script>
 <script src="markbind/js/setup.js"></script>
 <script src="markbind/layouts/default/scripts.js"></script>

diff --git a/test/functional/test_site/expected/markbind/js/setup.js b/test/functional/test_site/expected/markbind/js/setup.js
@@ -36,6 +36,15 @@ function setupAnchors() {
 function removeLoadingOverlay() {
   jQuery('#loading-overlay').remove();
 }
+
+function updateSearchData(vm) {
+  jQuery.getJSON(`${baseUrl}/siteData.json`)
+    .then((siteData) => {
+      // eslint-disable-next-line no-param-reassign
+      vm.searchData = siteData.pages;
+    });
+}
+
 function executeAfterMountedRoutines() {
   flattenModals();
   scrollToUrlAnchorHeading();
@@ -84,11 +93,7 @@ function setup() {
   setupPageNav();
 }
 
-function setupWithSearch(siteData) {
-  if (!siteData.enableSearch) {
-    setup();
-    return;
-  }
+function setupWithSearch() {
   const { searchbar } = VueStrap.components;
   // eslint-disable-next-line no-unused-vars
   const vm = new Vue({
@@ -98,7 +103,7 @@ function setupWithSearch(siteData) {
     },
     data() {
       return {
-        searchData: siteData.pages,
+        searchData: [],
       };
     },
     methods: {
@@ -110,12 +115,15 @@ function setupWithSearch(siteData) {
     },
     mounted() {
       executeAfterMountedRoutines();
+      updateSearchData(this);
     },
   });
   setupSiteNav();
   setupPageNav();
 }
 
-jQuery.getJSON(`${baseUrl}/siteData.json`)
-  .then(siteData => setupWithSearch(siteData))
-  .catch(() => setup());
+if (enableSearch) {
+  setupWithSearch();
+} else {
+  setup();
+}
diff --git a/test/functional/test_site/expected/sub_site/index.html b/test/functional/test_site/expected/sub_site/index.html
@@ -55,6 +55,7 @@ <h2 id="feature-list">Feature list<a class="fa fa-anchor" href="#feature-list"><
 <script src="../markbind/js/bootstrap-vue.min.js"></script>
 <script>
     const baseUrl = '/test_site'
+    const enableSearch = true
 </script>
 <script src="../markbind/js/setup.js"></script>
 <script src="../markbind/layouts/default/scripts.js"></script>

diff --git a/test/functional/test_site/expected/testEmptyFrontmatter.html b/test/functional/test_site/expected/testEmptyFrontmatter.html
@@ -46,6 +46,7 @@
 <script src="markbind/js/bootstrap-vue.min.js"></script>
 <script>
     const baseUrl = '/test_site'
+    const enableSearch = true
 </script>
 <script src="markbind/js/setup.js"></script>
 <script src="markbind/layouts/default/scripts.js"></script>

diff --git a/test/functional/test_site/expected/testExternalScripts.html b/test/functional/test_site/expected/testExternalScripts.html
@@ -49,6 +49,7 @@
 <script src="markbind/js/bootstrap-vue.min.js"></script>
 <script>
     const baseUrl = '/test_site'
+    const enableSearch = true
 </script>
 <script src="markbind/js/setup.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.5/MathJax.js?config=TeX-MML-AM_CHTML"></script>

diff --git a/test/functional/test_site/expected/testLayouts.html b/test/functional/test_site/expected/testLayouts.html
@@ -62,6 +62,7 @@ <h1 id="uses-a-front-matter-layout">Uses a front matter layout<a class="fa fa-an
 <script src="markbind/js/bootstrap-vue.min.js"></script>
 <script>
     const baseUrl = '/test_site'
+    const enableSearch = true
 </script>
 <script src="markbind/js/setup.js"></script>
 <script src="markbind/layouts/testLayout/scripts.js"></script>

diff --git a/test/functional/test_site/expected/testLayoutsOverride.html b/test/functional/test_site/expected/testLayoutsOverride.html
@@ -62,6 +62,7 @@ <h1 id="uses-a-site-json-layout-overriding-front-matter">Uses a site.json layout
 <script src="markbind/js/bootstrap-vue.min.js"></script>
 <script>
     const baseUrl = '/test_site'
+    const enableSearch = true
 </script>
 <script src="markbind/js/setup.js"></script>
 <script src="markbind/layouts/testLayout/scripts.js"></script>

diff --git a/test/functional/test_site/expected/testTags.html b/test/functional/test_site/expected/testTags.html
@@ -63,6 +63,7 @@ <h1 id="div-with-hidden-tag">Div with hidden tag<a class="fa fa-anchor" href="#d
 <script src="markbind/js/bootstrap-vue.min.js"></script>
 <script>
     const baseUrl = '/test_site'
+    const enableSearch = true
 </script>
 <script src="markbind/js/setup.js"></script>
 <script src="markbind/layouts/default/scripts.js"></script>

diff --git a/test/functional/test_site/expected/test_md_fragment.html b/test/functional/test_site/expected/test_md_fragment.html
@@ -47,6 +47,7 @@ <h1 id="some-heading">Some heading<a class="fa fa-anchor" href="#some-heading"><
 <script src="markbind/js/bootstrap-vue.min.js"></script>
 <script>
     const baseUrl = '/test_site'
+    const enableSearch = true
 </script>
 <script src="markbind/js/setup.js"></script>
 <script src="markbind/layouts/default/scripts.js"></script>