Merge branch 'release/5.0.4'

getgrav · Jan 26, 2021 · 5fab778 · 5fab778
2 parents 49bfdbf + 572719a
commit 5fab778
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v5.0.4
+## 01/26/2021
+
+1. [](#bugfix)
+   * NextGen Editor: Fixed regexp regression preventing multiple shortcodes to be parsed in certain circumstances
+
 # v5.0.3
 ## 01/15/2021
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,7 +1,7 @@
 name: Shortcode Core
 slug: shortcode-core
 type: plugin
-version: 5.0.3
+version: 5.0.4
 description: "This plugin provides the core functionality for shortcode plugins"
 icon: code
 author:

diff --git a/nextgen-editor/dist/js/app.js b/nextgen-editor/dist/js/app.js
diff --git a/nextgen-editor/dist/js/app.js.map b/nextgen-editor/dist/js/app.js.map
diff --git a/nextgen-editor/src/prerender.js b/nextgen-editor/src/prerender.js
@@ -10,7 +10,7 @@ window.nextgenEditor.addHook('hookMarkdowntoHTML', {
       .map((name) => `(\\[${name}[^\\]]*\\])`).join('|');
 
     realNames.forEach((name) => {
-      const regexp = `\\[${name}(?<attributes>(=| +).*)?\\/\\]`;
+      const regexp = `\\[${name}(?<attributes>(=| +).+?(?=/]))?\\/\\]`;
 
       output = output.replace(new RegExp(regexp, 'g'), (...matches) => {
         const groups = matches.pop();