Improve Rich Text module (#2196)

relates to xibosignage/xibo#3219
xibosignage · Nov 6, 2023 · 0b8ec0b · 0b8ec0b
1 parent c5082fd
commit 0b8ec0b
Show file tree

Hide file tree

Showing 9 changed files with 640 additions and 610 deletions.
diff --git a/modules/text.xml b/modules/text.xml
@@ -45,9 +45,6 @@
             <title>Media</title>
             <helpText>Choose media</helpText>
         </property>
-        <property id="javaScript" type="code" variant="javascript">
-            <title>Optional JavaScript</title>
-        </property>
         <property id="backgroundColor" type="color">
             <title>Background Colour</title>
             <helpText>The selected effect works best with a background colour. Optionally add one here.</helpText>
@@ -68,13 +65,34 @@
         </property>
         <property id="marqueeInlineSelector" type="text">
             <title>Marquee Selector</title>
-            <default>.item p</default>
+            <default>p</default>
             <helpText>The selector to use for stacking marquee items in a line when scrolling Left/Right.</helpText>
             <visibility>
                 <test>
                     <condition field="effect" type="neq">none</condition>
                 </test>
             </visibility>
+        </property>
+                <property id="seeAdvancedFields" type="checkbox">
+            <title>Show advanced controls?</title>
+            <helpText>Show Javascript and CSS controls.</helpText>
+            <default>0</default>
+        </property>
+        <property id="javaScript" type="code" variant="javascript">
+            <title>Optional JavaScript</title>
+            <visibility>
+                <test>
+                    <condition field="seeAdvancedFields" type="eq">1</condition>
+                </test>
+            </visibility>
+        </property>
+        <property id="styleSheet" type="code" allowLibraryRefs="true" variant="css">
+            <title>Optional Stylesheet</title>
+            <visibility>
+                <test>
+                    <condition field="seeAdvancedFields" type="eq">1</condition>
+                </test>qa
+            </visibility>
         </property>
     </properties>
     <preview></preview>
@@ -85,6 +103,7 @@
 </script>
 <style>
 {% if backgroundColor %}body { background-color: {{backgroundColor}}; }{% endif %}
+{{styleSheet|raw}}
 </style>
         ]]></twig>
     </stencil>

diff --git a/ui/src/core/forms.js b/ui/src/core/forms.js
@@ -1500,7 +1500,6 @@ window.forms = {
     ).each(function(_k, el) {
       formHelpers.setupCKEditor(
         container,
-        {},
         $(el).attr('id'),
         true,
         null,
@@ -2382,7 +2381,6 @@ window.forms = {
       // Reload
       formHelpers.setupCKEditor(
         $formContainer,
-        {},
         elId,
         true,
         null,