Fixed error when search term contained parentheses

This commit is contained in:
squidfunk 2017-03-24 19:37:39 +01:00 committed by Martin Donath
parent c732082a1c
commit de54e6e800
6 changed files with 38 additions and 6 deletions

View File

@ -0,0 +1,29 @@
/*
* Copyright (c) 2016-2017 Martin Donath <martin.donath@squidfunk.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to
* deal in the Software without restriction, including without limitation the
* rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
* sell copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
* IN THE SOFTWARE.
*/
/* ----------------------------------------------------------------------------
* Declarations
* ------------------------------------------------------------------------- */
declare module "escape-string-regexp" {
declare function exports(value: string): string
}

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -151,7 +151,7 @@
{% endblock %}
</div>
{% block scripts %}
<script src="{{ base_url }}/assets/javascripts/application-cc8bbd29c0.js"></script>
<script src="{{ base_url }}/assets/javascripts/application-66b3bb18b3.js"></script>
<script>app.initialize({url:{base:"{{ base_url }}"}})</script>
{% for path in extra_javascript %}
<script src="{{ path }}"></script>

View File

@ -33,7 +33,9 @@
"test:visual:update": "scripts/test/visual/update",
"test:visual:session": "scripts/test/visual/session"
},
"dependencies": {},
"dependencies": {
"escape-string-regexp": "^1.0.5"
},
"devDependencies": {
"autoprefixer": "^6.7.3",
"babel-core": "^6.23.0",

View File

@ -20,6 +20,7 @@
* IN THE SOFTWARE.
*/
import escape from "escape-string-regexp"
import lunr from "lunr"
/* ----------------------------------------------------------------------------
@ -184,7 +185,7 @@ export default class Result {
/* Assemble highlight regex from query string */
const match = new RegExp(
`\\b(${this.value_.trim().replace(" ", "|")})`, "img")
`\\b(${escape(this.value_.trim().replace(" ", "|"))})`, "img")
const highlight = string => `<em>${string}</em>`
/* Render results */