diff --git a/src/Site/views/languageforge/theme/default/sass/_variables.scss b/src/Site/views/languageforge/theme/default/sass/_variables.scss
index a5f3dc7203..fb4652c795 100644
--- a/src/Site/views/languageforge/theme/default/sass/_variables.scss
+++ b/src/Site/views/languageforge/theme/default/sass/_variables.scss
@@ -3,7 +3,6 @@
$theme-primary: #104060;
$lf-blue-dark: #0a2440;
$lf-highlight: #CDDEEB;
-// TODO: Check if we need to change the font to the new design or stick to the default one
$lf-font: "PT Sans",sans-serif;
$lf-comments: #D89D49;
diff --git a/src/Site/views/shared/container/container.html.twig b/src/Site/views/shared/container/container.html.twig
index dd52889f64..79504ca020 100644
--- a/src/Site/views/shared/container/container.html.twig
+++ b/src/Site/views/shared/container/container.html.twig
@@ -9,7 +9,7 @@
{{ app.website.name }}
-
+
{% for cssFile in vendorFilesCss %}
@@ -17,9 +17,7 @@
- {% if manifestFilename %}
-
- {% endif %}
+
{# jquery must be the first js to be loaded #}
{% if useMinifiedJs %}
diff --git a/src/angular-app/bellows/core/offline/editor-data.service.ts b/src/angular-app/bellows/core/offline/editor-data.service.ts
index c36d547c58..24f37ed487 100644
--- a/src/angular-app/bellows/core/offline/editor-data.service.ts
+++ b/src/angular-app/bellows/core/offline/editor-data.service.ts
@@ -44,6 +44,8 @@ class EntryListModifiers {
};
sortOptions: SortOption[] = [];
sortReverse = false;
+ wholeWord = false;
+ matchDiacritic = false;
filterBy: {
text: string;
option: FilterOption;
@@ -443,19 +445,45 @@ export class EditorDataService {
text.indexOf(query) === 0 && !UtilityService.isDigitsOnly(text.slice(query.length - 1, query.length + 1));
}
- private entryMeetsFilterCriteria(config: any, entry: LexEntry): boolean {
+ // this ensures regex tokens are not interpreted as regex, e.g., a user searching for '[a-zA-Z]' should _probably_ result in no matches.
+ private escapeRegex(input: string) {
+ // taken from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions#escaping
+ return input.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'); // $& means the whole matche
+ }
+ private removeDiacritics(input: string) {
+ // refs:
+ // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/normalize
+ // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions/Unicode_Property_Escapes
+ // https://unicode.org/reports/tr44/#Diacritic
+ // https://stackoverflow.com/a/37511463/10818013
+
+ return input.normalize('NFD').replace(/\p{Diacritic}/gu, '')
+ }
+
+ private entryMeetsFilterCriteria(config: any, entry: LexEntry): boolean {
if (this.entryListModifiers.filterText() !== '') {
- const query = this.entryListModifiers.filterText().toUpperCase();
- let matchesSearch = false;
+ const rawQuery = this.entryListModifiers.filterText()
+ const normalizedQuery = this.entryListModifiers.matchDiacritic ? rawQuery : this.removeDiacritics(rawQuery);
+ const regexSafeQuery = this.escapeRegex(normalizedQuery);
+ const queryRegex = new RegExp(this.entryListModifiers.wholeWord ? `\\b${regexSafeQuery}\\b` : regexSafeQuery, 'i');
+ let found = false;
+
this.walkEntry(config.entry, entry, (val, isSemanticDomain) => {
- val = val.toUpperCase();
- if (isSemanticDomain) {
- if (this.semanticDomainsMatch(val, query)) matchesSearch = true;
- } else if (val.indexOf(query) !== -1) matchesSearch = true;
+ if (isSemanticDomain && this.semanticDomainsMatch(val, rawQuery)) {
+ found = true;
+ } else {
+ const normalizedValue = this.entryListModifiers.matchDiacritic ? val : this.removeDiacritics(val)
+
+ if (queryRegex.test(normalizedValue)) {
+ found = true;
+ }
+ }
});
- if (!matchesSearch) return false;
+
+ if (!found) return false;
}
+
if (!this.entryListModifiers.filterBy.option) return true;
const mustNotBeEmpty = this.entryListModifiers.filterType === 'isNotEmpty';
diff --git a/src/angular-app/bellows/core/service-worker-registration.js b/src/angular-app/bellows/core/service-worker-registration.js
index 39648621b0..a1e1422e5b 100644
--- a/src/angular-app/bellows/core/service-worker-registration.js
+++ b/src/angular-app/bellows/core/service-worker-registration.js
@@ -1,58 +1,3 @@
-/**
- * Copyright 2015 Google Inc. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/* eslint-env browser */
-'use strict';
-
if ('serviceWorker' in navigator) {
- // Your service-worker.js *must* be located at the top-level directory relative to your site.
- // It won't be able to control pages unless it's located at the same level or higher than them.
- // *Don't* register service worker file in, e.g., a scripts/ sub-directory!
- // See https://github.com/slightlyoff/ServiceWorker/issues/468
- navigator.serviceWorker.register('/dist/service-worker.js', { scope: '/' }).then(function (reg) {
- // updatefound is fired if service-worker.js changes.
- reg.onupdatefound = function () {
- // The updatefound event implies that reg.installing is set; see
- // https://slightlyoff.github.io/ServiceWorker/spec/service_worker/index.html#service-worker-container-updatefound-event
- var installingWorker = reg.installing;
-
- installingWorker.onstatechange = function () {
- switch (installingWorker.state) {
- case 'installed':
- if (navigator.serviceWorker.controller) {
- // At this point, the old content will have been purged and the fresh content will
- // have been added to the cache.
- // It's the perfect time to display a "New content is available; please refresh."
- // message in the page's interface.
- console.log('New or updated content is available.');
- } else {
- // At this point, everything has been precached.
- // It's the perfect time to display a "Content is cached for offline use." message.
- console.log('Content is now available offline!');
- }
-
- break;
-
- case 'redundant':
- console.error('The installing service worker became redundant.');
- break;
- }
- };
- };
- }).catch(function (e) {
- console.error('Error during service worker registration:', e);
- });
+ navigator.serviceWorker.register('/dist/service-worker.js', { scope: '/' })
}
diff --git a/src/angular-app/languageforge/lexicon/editor/editor-entry.view.html b/src/angular-app/languageforge/lexicon/editor/editor-entry.view.html
index bdd28b0e73..f1b0bb2ad4 100644
--- a/src/angular-app/languageforge/lexicon/editor/editor-entry.view.html
+++ b/src/angular-app/languageforge/lexicon/editor/editor-entry.view.html
@@ -33,7 +33,7 @@
@@ -45,7 +45,6 @@