Skip to content

Commit 680355b

Browse files
committed
fix: implementation fixes after @Guileas's manual review
1 parent ce9b034 commit 680355b

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

src/Resources/themes/default/doctum.js.twig

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ var Doctum = {
2424
doctumSearchAutoCompleteProgressBarPercent: 0,
2525
/** @var autoComplete|null */
2626
autoCompleteJS: null,
27-
querySearchSecurityRegex: /([^a-zA-Z:\\\\_\s])/gi,
27+
querySearchSecurityRegex: /([^0-9a-zA-Z:\\\\_\s])/gi,
2828
buildTreeNode: function (treeNode, htmlNode, treeOpenLevel) {
2929
var ulNode = document.createElement('ul');
3030
for (var childKey in treeNode.c) {
@@ -152,7 +152,6 @@ var Doctum = {
152152
document.getElementById('search-form').submit();
153153
});
154154
Doctum.doctumSearchAutoComplete.addEventListener('navigate', function (event) {
155-
Doctum.markInProgress();
156155
// Set selection in text box
157156
if (typeof event.detail.selection.value === 'object') {
158157
Doctum.doctumSearchAutoComplete.value = event.detail.selection.value.n;
@@ -314,6 +313,9 @@ var Doctum = {
314313
query: (input) => {
315314
return Doctum.cleanSearchQuery(input);
316315
},
316+
trigger: (query) => {
317+
return Doctum.cleanSearchQuery(query).length > 0;
318+
},
317319
resultsList: {
318320
tag: 'ul',
319321
class: 'auto-complete-dropdown-menu',

src/Resources/themes/default/search.twig

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@
9898
return DoctumSearch.longTypes[type] || DoctumSearch.longTypes['_'];
9999
},
100100
pageFullyLoaded: function (event) {// Will get fired by the main doctum.js script
101-
DoctumSearch.searchTerm = DoctumSearch.cleanSearchTerm();
101+
DoctumSearch.searchTerm = Doctum.cleanSearchQuery(DoctumSearch.cleanSearchTerm());
102102
DoctumSearch.doctumSearchPageAutoCompleteProgressBarContainer = document.getElementById('search-page-progress-bar-container');
103103
DoctumSearch.doctumSearchPageAutoCompleteProgressBar = document.getElementById('search-page-progress-bar');
104104
DoctumSearch.pageFullyLoaded = true;
@@ -142,6 +142,9 @@
142142
query: (input) => {
143143
return Doctum.cleanSearchQuery(input);
144144
},
145+
trigger: (query) => {
146+
return Doctum.cleanSearchQuery(query).length > 0;
147+
},
145148
resultsList: {
146149
tag: 'ul',
147150
class: 'search-results',

0 commit comments

Comments
 (0)