Skip to content

Commit

Permalink
Merge branch 'main' into 3.x
Browse files Browse the repository at this point in the history
  • Loading branch information
arukompas committed Oct 10, 2023
2 parents b5922f1 + dc41ee8 commit 69d886a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion public/app.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/mix-manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"/app.js": "/app.js?id=dadc2684c772ac2969fd50f50cc84fb3",
"/app.js": "/app.js?id=a9c7dc2c5d650205333810ac101da5e4",
"/app.css": "/app.css?id=1d3e1405b5f756d27f515e824e61f265",
"/img/log-viewer-128.png": "/img/log-viewer-128.png?id=d576c6d2e16074d3f064e60fe4f35166",
"/img/log-viewer-32.png": "/img/log-viewer-32.png?id=f8ec67d10f996aa8baf00df3b61eea6d",
Expand Down
3 changes: 2 additions & 1 deletion resources/js/helpers.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ export const highlightSearchResult = (text, query = null) => {
// while escaping the rest of the HTML entities
return escapeHtml(text)
.replace(/&lt;mark&gt;/g, '<mark>')
.replace(/&lt;\/mark&gt;/g, '</mark>');
.replace(/&lt;\/mark&gt;/g, '</mark>')
.replace(/&lt;br\/&gt;/g, '<br/>');
};

export const escapeHtml = (text) => {
Expand Down

0 comments on commit 69d886a

Please sign in to comment.