Merge branch 'release/3.1.1'

Author: rhukster

CHANGELOG.md

@@ -1,3 +1,13 @@
+# v3.1.1
+## 02/12/2020
+
+1. [](#improved)
+    * Search with JS disabled [#75](https://github.com/trilbymedia/grav-plugin-tntsearch/pull/75)
+    * Added RU 🇷🇺 language [#74](https://github.com/trilbymedia/grav-plugin-tntsearch/pull/74) 
+    * Various JS dependency updates & recompiled production JS
+1. [](#bugfix)
+    * Added missing `search_object_type` to blueprint
+
 # v3.1.0
 ## 02/11/2020
 

assets/tntsearch.js

@@ -1,5 +1,5 @@
 name: TNT Search
-version: 3.1.0
+version: 3.1.1
 testing: false
 description: Powerful indexed-based full text search engine powered by TNTSearch
 icon: binoculars
@@ -273,3 +273,13 @@ form:
         0: Disabled
       validate:
         type: bool
+
+    adv_title:
+      type: spacer
+      title: Advanced Settings
+
+    search_object_type:
+      type: text
+      label: Search Object Type
+      help: Allows for overriding the deafult search type to a custom type provided by a plugin.
+      default: Grav

blueprints.yaml

@@ -1,4 +1,10 @@
 en:
   PLUGIN_TNTSEARCH:
     FOUND_RESULTS: "Found %s results"
-    FOUND_IN: "in <span>%s</span>"
+    FOUND_IN: "in <span>%s</span>"
+    POWERED_BY: "Powered by %s"
+ru:
+  PLUGIN_TNTSEARCH:
+    FOUND_RESULTS: "Результатов: %s"
+    FOUND_IN: "(<span>%s</span>)"
+    POWERED_BY: "Работает на %s"

languages.yaml

@@ -14,8 +14,8 @@
     "domready": "^1.0.8",
     "history": "^4.7.2",
     "lodash": "^4.17.4",
-    "querystringify": "^1.0.0",
-    "url-parse": "^1.2.0",
+    "querystringify": "^2.0.0",
+    "url-parse": "^1.4.3",
     "whatwg-fetch": "^2.0.3"
   },
   "devDependencies": {
@@ -26,7 +26,7 @@
     "babel-preset-es2015": "^6.24.1",
     "babel-preset-stage-3": "^6.24.1",
     "css-loader": "^0.28.9",
-    "eslint": "^4.16.0",
+    "eslint": "^4.18.2",
     "eslint-config-defaults": "^9.0.0",
     "eslint-loader": "^1.9.0",
     "exports-loader": "^0.6.4",

package.json

@@ -5,13 +5,14 @@
 {% set search_type = search_type|default(config.get('plugins.tntsearch.search_type', 'auto')) %}
 {% set placeholder = placeholder|default('Search...') %}
 {% set live_update = in_page ? live_update|default(config.get('plugins.tntsearch.live_uri_update', 1)) : 0 %}
+{% set nojs_action = config.get('plugins.tntsearch.search_route', '/search')|trim('/') %}
 
 {% set options = { uri: url, limit: limit, snippet: snippet, min: min, in_page: in_page, live_update: live_update, search_type: search_type } %}
 
-<form role="form" class="tntsearch-form">
+<form role="form" class="tntsearch-form" action="{{ nojs_action }}" method="get">
     {% block tntsearch_input %}
     <div id="tntsearch-wrapper" class="form-group{{ dropdown ? ' tntsearch-dropdown' : '' }}">
-        <input type="text" class="form-control form-input tntsearch-field{{ in_page ? ' tntsearch-field-inpage' : '' }}" data-tntsearch="{{ options|json_encode|e('html_attr') }}" placeholder="{{ placeholder }}" value="{{ not dropdown ? query|e : '' }}" autofocus>
+        <input type="text" name="q" class="form-control form-input tntsearch-field{{ in_page ? ' tntsearch-field-inpage' : '' }}" data-tntsearch="{{ options|json_encode|e('html_attr') }}" placeholder="{{ placeholder }}" value="{{ not dropdown ? query|e : '' }}" autofocus>
         <span class="tntsearch-clear"{{ not query or dropdown ? ' style="display: none;"' : '' }}>&times;</span>
     </div>
     {% endblock %}
@@ -23,7 +24,7 @@
 
     {% if config.get('plugins.tntsearch.powered_by') %}
     <p class="tntsearch-powered-by">
-        Powered by <a href="https://github.com/trilbymedia/grav-plugin-tntsearch" target="_blank">TNTSearch</a>
+        {{ "PLUGIN_TNTSEARCH.POWERED_BY"|t("<a href='https://github.com/trilbymedia/grav-plugin-tntsearch' target='_blank'>TNTSearch</a>")|raw }}
     </p>
     {% endif %}
 </form>