diff --git a/ols-web/pom.xml b/ols-web/pom.xml index bbcb5ec8..0904de65 100644 --- a/ols-web/pom.xml +++ b/ols-web/pom.xml @@ -93,9 +93,9 @@ - com.github.warmuuh - libsass-maven-plugin - 0.2.10-libsass_3.5.3 + nl.geodienstencentrum.maven + sass-maven-plugin + 3.7.2 @@ -156,26 +156,28 @@ - - com.github.warmuuh - libsass-maven-plugin - 0.2.10-libsass_3.5.3 - - - generate-resources - - compile - - - - - ${project.basedir}/src/main/resources/scss/ - - ${project.basedir}/src/main/resources/static/css/ - - ${project.basedir}/src/main/resources/static/css/ - - + + nl.geodienstencentrum.maven + sass-maven-plugin + 3.7.2 + + + generate-css + generate-resources + + update-stylesheets + + + + true + + ${project.basedir}/src/main/resources/scss + ${project.basedir}/src/main/resources/static/css + + + + + diff --git a/ols-web/src/main/resources/static/js/ols.js b/ols-web/src/main/resources/static/js/ols.js index 3d7ae873..1d086b0b 100644 --- a/ols-web/src/main/resources/static/js/ols.js +++ b/ols-web/src/main/resources/static/js/ols.js @@ -21,7 +21,7 @@ function goTo (url) { $(function() { $('p.annotation-value').each(function(i, el) { - $(el).html($(el).html().replace(/((http|https|ftp):\/\/[^\s,]+)/g, function(url) { + $(el).html($(el).html().replace(/((http|https|ftp):\/\/[^\s,\[\]]+)/g, function(url) { console.log("Replacing URL with link: " + url); return "" + escapeHtml(url) + ""; })) @@ -100,4 +100,4 @@ function escapeHtml(unsafe) .replace(/>/g, ">") .replace(/"/g, """) .replace(/'/g, "'"); - } \ No newline at end of file + }