API: extend class missing escape attribute used for elements FE (#2115)

relates to xibosignageltd/xibo-private#494
xibosignage · Sep 26, 2023 · e74eff4 · e74eff4
1 parent de55174
commit e74eff4
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 1 deletion.
diff --git a/lib/Widget/Render/WidgetHtmlRenderer.php b/lib/Widget/Render/WidgetHtmlRenderer.php
@@ -642,6 +642,7 @@ private function render(
                     'extends' => [
                         'override' => $moduleTemplate->extends?->override,
                         'with' => $moduleTemplate->extends?->with,
+                        'escapeHtml' => $moduleTemplate->extends?->escapeHtml,
                     ],
                 ];
             } else if ($extension !== null) {
@@ -654,6 +655,7 @@ private function render(
                     'extends' => [
                         'override' => $moduleTemplate->extends?->override,
                         'with' => $moduleTemplate->extends?->with,
+                        'escapeHtml' => $moduleTemplate->extends?->escapeHtml,
                     ],
                 ];
 

diff --git a/modules/src/player.js b/modules/src/player.js
@@ -575,13 +575,16 @@ $(function() {
         elementCopy.hbs = null;
         elementCopy.dataOverride = null;
         elementCopy.dataOverrideWith = null;
+        elementCopy.escapeHtml = null;
 
         // Compile the template if it exists
         if ($template && $template.length > 0) {
           elementCopy.dataOverride =
               $template?.data('extends-override');
           elementCopy.dataOverrideWith =
               $template?.data('extends-with');
+          elementCopy.escapeHtml =
+              $template?.data('escape-html');
 
           elementCopy.hbs = Handlebars.compile($template.html());
         }

diff --git a/modules/templates/global-elements.xml b/modules/templates/global-elements.xml
@@ -176,7 +176,11 @@
     {{#if textShadow}}text-shadow: {{shadowX}}px {{shadowY}}px {{shadowBlur}}px {{textShadowColor}};{{/if}}
     width: 100%; height: 100%;"
 >
-<div>{{{text}}}</div>
+{{#if escapeHtml}}
+    <div>{{text}}</div>
+{{else}}
+    <div>{{{text}}}</div>
+{{/if}}
 </div>
             ]]></hbs>
         </stencil>

diff --git a/modules/widget-html-render.twig b/modules/widget-html-render.twig
@@ -93,6 +93,7 @@
             data-gap="{{ item.gapBetweenHbs }}"
             data-extends-override="{{ item.extends.override }}"
             data-extends-with="{{ item.extends.with }}"
+            data-escape-html="{{ item.extends.escapeHtml }}"
     >{{ item.content|raw }}</script>
 {% endfor %}
 {% for widgetId, parser in onInitialize %}

diff --git a/ui/src/layout-editor/viewer.js b/ui/src/layout-editor/viewer.js
@@ -1667,6 +1667,9 @@ Viewer.prototype.renderElementContent = function(
           }
         }
 
+        // Escape HTML
+        convertedProperties.escapeHtml = template?.extends?.escapeHtml;
+
         // Compile hbs template with data
         let hbsHtml = hbsTemplate(convertedProperties);