lunr.js in j1-template-2023.0.14

- old
+ new

@@ -39,21 +39,18 @@
 {% assign template_version      = site.version %}
 
 {% assign lunr_search_defaults  = modules.defaults.lunr.defaults %}
 {% assign lunr_search_settings  = modules.lunr.settings %}
 
-{% comment %} Set config options
--------------------------------------------------------------------------------- {% endcomment %}
-{% assign lunr_search_options   = lunr_search_defaults | merge: lunr_search_settings %}
-
 {% comment %} Detect prod mode
 -------------------------------------------------------------------------------- {% endcomment %}
 {% assign production = false %}
 {% if environment == 'prod' or environment == 'production' %}
   {% assign production = true %}
 {% endif %}
 
+
 /*
  # -----------------------------------------------------------------------------
  # ~/assets/themes/j1/adapter/js/lunr.js
  # J1 Adapter for J1 Lunr
  #
@@ -77,12 +74,14 @@
 'use strict';
 j1.adapter.lunr = (function (j1, window) {
 
   {% comment %} Set global variables
   ------------------------------------------------------------------------------ {% endcomment %}
-  var environment   = '{{environment}}';
-  var searchOptions = {};
+  var environment = '{{environment}}';
+  var searchDefaults;
+  var searchSettings;
+  var searchOptions;
   var _this;
   var logger;
   var logText;
   var modalBody;
 
@@ -112,14 +111,13 @@
       // Global variable settings
       // -----------------------------------------------------------------------
       _this   = j1.adapter.lunr;
       logger  = log4javascript.getLogger('j1.adapter.lunr');
 
-      // -----------------------------------------------------------------------
-      // options loader
-      // -----------------------------------------------------------------------
-      /* eslint-disable */
-      searchOptions = $.extend({}, {{lunr_search_options | replace: '=>', ':' | replace: 'nil', '""'}});
+      // Load  module DEFAULTS|CONFIG
+      searchDefaults = $.extend({},   {{lunr_search_defaults | replace: 'nil', 'null' | replace: '=>', ':' }});
+      searchSettings = $.extend({},   {{lunr_search_settings | replace: 'nil', 'null' | replace: '=>', ':' }});
+      searchOptions  = $.extend(true, {}, searchDefaults, searchSettings);
 
       // -----------------------------------------------------------------------
       // lunr initializer
       // -----------------------------------------------------------------------
       var dependencies_met_j1_finished = setInterval(function() {