Merge pull request #239 from simonsymhoven/bug/jquery-escaping-meta-c…

…haracters escape js meta characters if using jQuery3
jenkinsci · Jun 19, 2022 · 63f78dc · 63f78dc
2 parents 5e39cce + cbbf8c2
commit 63f78dc
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 2 deletions.
diff --git a/src/main/resources/io/jenkins/plugins/echarts-common.jelly b/src/main/resources/io/jenkins/plugins/echarts-common.jelly
@@ -20,5 +20,6 @@ Use it like <st:adjunct includes="io.jenkins.plugins.echarts-common"/>
   <script type="text/javascript" src="${resURL}/plugin/echarts-api/js/configurable-trend-chart.js"/>
   <script type="text/javascript" src="${resURL}/plugin/echarts-api/js/pie-chart.js"/>
   <script type="text/javascript" src="${resURL}/plugin/echarts-api/js/progress-chart.js"/>
+  <script type="text/javascript" src="${resURL}/plugin/echarts-api/js/escapeMetaCharacters.js"/>
 
 </j:jelly>
diff --git a/src/main/resources/io/jenkins/plugins/echarts-simple.jelly b/src/main/resources/io/jenkins/plugins/echarts-simple.jelly
@@ -20,5 +20,6 @@ Use it like <st:adjunct includes="io.jenkins.plugins.echarts-simple"/>
   <script type="text/javascript" src="${resURL}/plugin/echarts-api/js/configurable-trend-chart.js"/>
   <script type="text/javascript" src="${resURL}/plugin/echarts-api/js/pie-chart.js"/>
   <script type="text/javascript" src="${resURL}/plugin/echarts-api/js/progress-chart.js"/>
+  <script type="text/javascript" src="${resURL}/plugin/echarts-api/js/escapeMetaCharacters.js"/>
 
 </j:jelly>
diff --git a/src/main/resources/io/jenkins/plugins/echarts.jelly b/src/main/resources/io/jenkins/plugins/echarts.jelly
@@ -20,5 +20,6 @@ Use it like <st:adjunct includes="io.jenkins.plugins.echarts"/>
   <script type="text/javascript" src="${resURL}/plugin/echarts-api/js/configurable-trend-chart.js"/>
   <script type="text/javascript" src="${resURL}/plugin/echarts-api/js/pie-chart.js"/>
   <script type="text/javascript" src="${resURL}/plugin/echarts-api/js/progress-chart.js"/>
+  <script type="text/javascript" src="${resURL}/plugin/echarts-api/js/escapeMetaCharacters.js"/>
 
 </j:jelly>
diff --git a/src/main/webapp/js/escapeMetaCharacters.js b/src/main/webapp/js/escapeMetaCharacters.js
@@ -0,0 +1,3 @@
+function escapeMetaCharacters(string) {
+    return string.replaceAll(/[.*+?^${}()|[\]\\]/g, '\\$&')
+}
diff --git a/src/main/webapp/js/pie-chart.js b/src/main/webapp/js/pie-chart.js
@@ -35,7 +35,7 @@ jQuery3(document).ready(function () {
                 }
             }
 
-            const chartPlaceHolder = jQuery3("#" + chartDivId);
+            const chartPlaceHolder = jQuery3("#" + escapeMetaCharacters(chartDivId));
             const model = JSON.parse(chartPlaceHolder.attr('data-chart-model'));
             const title = chartPlaceHolder.attr('data-title');
             const chartDiv = chartPlaceHolder[0];

diff --git a/src/main/webapp/js/progress-chart.js b/src/main/webapp/js/progress-chart.js
@@ -10,7 +10,7 @@ jQuery3(document).ready(function () {
          * @param {String} chartDivId - the ID of the div where the chart should be shown in
          */
         function renderProgressChart(chartDivId) {
-            const chartPlaceHolder = jQuery3("#" + chartDivId);
+            const chartPlaceHolder = jQuery3("#" + escapeMetaCharacters(chartDivId));
             const model = JSON.parse(chartPlaceHolder.attr('data-chart-model'));
             const title = chartPlaceHolder.attr('data-title');
             const tooltip = chartPlaceHolder.attr('data-tooltip');