nicolo/caprigis
1
1
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

Simplify marker regex + link CSS

Browse Source
This commit is contained in:
Nicolò P 2025-11-12 17:16:53 +01:00
parent ebea10059e
commit b0915d0973
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
webgis/js/components/utils.js
View File

@ -4,7 +4,6 @@ import { GisState } from "../state.js";
*/ */
const Utils = {}; const Utils = {};
/** /**
* *
* @param {string} galleryId The image gallery's id * @param {string} galleryId The image gallery's id
@ -145,13 +144,12 @@ Utils.buildBibliography = async function(recordUri, recordId) {
} }
/** /**
*
* @param {String} text - The content text from database
* Parse marker strings (pseudo-shortcodes) and convert them * Parse marker strings (pseudo-shortcodes) and convert them
* to Stimulus links * to Stimulus links
* @param {String} text - The content text from database
*/ */
Utils.parseMarkers = function(text) { Utils.parseMarkers = function(text) {
const regex = /(?<marker>\[marker coords=\"(?<coords>[\d\s\.]+)\"\ ?(group=\"(?<group>\w+)\")?](?<content>[\w\d\s\.;,:\-\(\)\"\']+)\[\/marker\])/mig; const regex = /(?<marker>\[marker coords=\"(?<coords>[\d\s\.]+)\"\ ?(group=\"(?<group>\w+)\")?](?<content>[\s\S]+?)\[\/marker\])/mig;
if (!text) return text; if (!text) return text;
@ -159,9 +157,9 @@ Utils.parseMarkers = function(text) {
if (matches.length) { if (matches.length) {
matches.forEach(match => { matches.forEach(match => {
const replacement = `<a data-action="marker#go modal#close tabs#reset marker#goAndOpen" data-controller="marker" const replacement = `<a class="has-text-link" data-action="marker#go modal#close tabs#reset marker#goAndOpen" data-controller="marker"
data-marker-coords-value="${match.groups.coords}" data-marker-group-value="${match.groups.group}"> data-marker-coords-value="${match.groups.coords}"
${match.groups.content}</a>`; data-marker-group-value="${match.groups.group}">${match.groups.content.trim()}</a>`;
text = text.replace(match.groups.marker, replacement.trim()); text = text.replace(match.groups.marker, replacement.trim());
}); });
} }