Fix frontend JS

docpress · Oct 20, 2015 · 2807aec · 2807aec
1 parent 31d9e93
commit 2807aec
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/data/search.js b/data/search.js
@@ -8,13 +8,13 @@ var lunr = require('lunr')
 window.Search = (function () {
   var Search = {}
 
-  Search.lunr = lunr.Index.load(JSON.parse(window.__lunrindex))
+  Search.lunr = lunr.Index.load(window.__lunrindex)
 
   Search.search = function (keywords) {
     var results = Search.lunr.search(keywords)
     return results.map(function (result) {
       // result == { ref: 'index.html#usage', score: 0.99 }
-      return window.__lunrindex[result.ref]
+      return window.__searchindex[result.ref]
     })
   }
 

diff --git a/index.js b/index.js
@@ -58,11 +58,11 @@ function addJs (files, ms, done) {
     if (err) return done(err)
     contents =
       'window.__searchindex=(' +
-      JSON.stringify(files['_docpress.json'].searchIndex) +
-      ')\n' +
+      JSON.stringify(files['_docpress.json'].searchIndex, null, 2) +
+      ');\n' +
       'window.__lunrindex=(' +
       files['_docpress.json'].lunrIndex +
-      ')\n' + contents
+      ');\n' + contents
     files['assets/search.js'] = { contents }
     done()
   }
@@ -110,7 +110,7 @@ function lunrize (idx) {
 function extendIndex (file, block) {
   delete file.contents
   block(file)
-  file.contents = JSON.stringify(file, null, 2)
+  file.contents = JSON.stringify(file)
 }
 
 /**