update view_facet

README.md

@@ -5,13 +5,6 @@ Originally forked from [jekyll-lunr-js-search](https://github.com/slashdotdash/j
 ### Using gem
 Quickstart instructions are located here: [https://dnoneill.github.io/jekyll-lunr-js-custom-search/quickstart](https://dnoneill.github.io/jekyll-lunr-js-custom-search/quickstart)
 
-### 6. Alternate data directory
-
-You can choose to store `index.js`, `custom-search.js` and `lunr.js` in a different directory like this:
-
-    lunr_search:
-      js_dir: "javascript"
-
 ### Development Requirements
 
 Install [Bundler](http://bundler.io/) and then run the following.

build/jekyll_lunr_js_custom_search.rb

@@ -14,10 +14,11 @@ def initialize(config = {})
                 @jekyllconfig = config
                 @config = config['lunr_settings']
                 fields = Hash[@config['fields'].collect { |field| [field['searchfield'], field['boost']] }]
+                jsdir = @config['js_dir'] ? @config['js_dir'] : 'js'
                 @lunr_config = {
-                    'js_dir' => 'js',
+                    'js_dir' => jsdir,
                     'css_dir' => 'css'
-                }.merge!(config['lunr_search'] || {})
+                }
                 @lunr_config['fields'] = fields
                 @js_dir = @lunr_config['js_dir']
                 @css_dir = @lunr_config['css_dir']
@@ -108,7 +109,7 @@ def generate(site)
                 ctx = ExecJS.compile(index_js)
 
                 index = ctx.eval('JSON.stringify(idx)')
-                total = "var docs = #{@docs.to_json}\nvar index = #{index.to_json}\nvar view_facets = #{@jekyllconfig['view_facets'].to_json}\nvar baseurl = #{@jekyllconfig['baseurl'].to_json}\nvar lunr_settings = #{@config.to_json}"
+                total = "var docs = #{@docs.to_json}\nvar index = #{index.to_json}\nvar baseurl = #{@jekyllconfig['baseurl'].to_json}\nvar lunr_settings = #{@config.to_json}"
                 filepath = File.join(site.dest, filename)
                 File.open(filepath, "w") { |f| f.write(total) }
                 Jekyll.logger.info "Lunr:", "Index ready (lunr.js v#{@lunr_version})"

demo/_config.yml

@@ -30,9 +30,6 @@ plugins:
   - jekyll-feed
   - jekyll-lunr-js-custom-search
 
-view_facets: 5
-
-
 lunr_settings:
   atozsortfield: preferredName
   collections: [people]
@@ -83,6 +80,7 @@ lunr_settings:
     secondaryfield: contributorId
     widget: relational
   fuzzysearchfields: [name, birthplace, residences, worklocations]
+  view_facets: 5
 
 collections:
     people:

demo/docs/quickstart/setup.md

@@ -181,6 +181,17 @@ lunr_settings:
   fuzzysearchfields: [name]
 ```
 
+## view_facets
+**view_facets** should be a number field. This is an **optional** field, if it is not set it will revert to the **default** setting of 4. This determines how many facets are shown, if there are more facets then view_facets the remaining facets will be hidden but can be displayed with the "Show All" button that is automatically generated.
+
+## js_dir
+You can choose to store `index.js`, `custom-search.js` and `lunr.js` in a different directory like this:
+
+```
+lunr_settings:
+  js_dir: "javascript"
+```
+
 ## Full settings example
 An example of all these settings can be seen below. An example of it running is here: [https://dnoneill.github.io/jekyll-customsearch/search?q=&name=&ethnicity=](https://dnoneill.github.io/jekyll-customsearch/search?q=&name=&ethnicity=)
 
@@ -235,4 +246,5 @@ lunr_settings:
     secondaryfield: contributorId
     widget: relational
   fuzzysearchfields: [name, birthplace, residences, worklocations]
+  view_facets: 5
 ```

js/lunr.custom.search.js

@@ -183,7 +183,7 @@ function loadsearchtemplate(settings){
 	    	return tmp;
 		}();
 	}
-	view_facets = view_facets ? view_facets : 4;
+  view_facets = lunr_settings['view_facets'] ? lunr_settings['view_facets'] : 4;
     var site_url = window.location.origin + window.location.pathname;
     var query = window.location.search.substring(1);
     if (query != ''){

lib/jekyll_lunr_js_custom_search/indexer.rb

@@ -14,10 +14,11 @@ def initialize(config = {})
                 @jekyllconfig = config
                 @config = config['lunr_settings']
                 fields = Hash[@config['fields'].collect { |field| [field['searchfield'], field['boost']] }]
+                jsdir = @config['js_dir'] ? @config['js_dir'] : 'js'
                 @lunr_config = {
-                    'js_dir' => 'js',
+                    'js_dir' => jsdir,
                     'css_dir' => 'css'
-                }.merge!(config['lunr_search'] || {})
+                }
                 @lunr_config['fields'] = fields
                 @js_dir = @lunr_config['js_dir']
                 @css_dir = @lunr_config['css_dir']
@@ -108,7 +109,7 @@ def generate(site)
                 ctx = ExecJS.compile(index_js)
 
                 index = ctx.eval('JSON.stringify(idx)')
-                total = "var docs = #{@docs.to_json}\nvar index = #{index.to_json}\nvar view_facets = #{@jekyllconfig['view_facets'].to_json}\nvar baseurl = #{@jekyllconfig['baseurl'].to_json}\nvar lunr_settings = #{@config.to_json}"
+                total = "var docs = #{@docs.to_json}\nvar index = #{index.to_json}\nvar baseurl = #{@jekyllconfig['baseurl'].to_json}\nvar lunr_settings = #{@config.to_json}"
                 filepath = File.join(site.dest, filename)
                 File.open(filepath, "w") { |f| f.write(total) }
                 Jekyll.logger.info "Lunr:", "Index ready (lunr.js v#{@lunr_version})"