Inline Playlist Editor: Rich text same colour as layout's (#2447)

relates to xibosignage/xibo#3377
xibosignage · Mar 26, 2024 · 974b7a7 · 974b7a7
1 parent 6b6db37
commit 974b7a7
Showing 1 changed file with 34 additions and 13 deletions.
diff --git a/ui/src/helpers/form-helpers.js b/ui/src/helpers/form-helpers.js
@@ -539,14 +539,24 @@ const formHelpers = function() {
 
       // COLORS
       // Background color for the editor
-      const backgroundColor =
-        (
-          this.mainObject != undefined &&
-          typeof this.mainObject.backgroundColor != 'undefined' &&
-          this.mainObject.backgroundColor != null
-        ) ?
-          this.mainObject.backgroundColor :
-          this.defaultBackgroundColor;
+      let backgroundColor = this.defaultBackgroundColor;
+
+      // From layout editor
+      if (
+        this.mainObject != undefined &&
+        typeof this.mainObject.backgroundColor != 'undefined' &&
+        this.mainObject.backgroundColor != null
+      ) {
+        backgroundColor = this.mainObject.backgroundColor;
+      }
+
+      // From inline playlist editor
+      if (
+        this.namespace.inline &&
+        lD && lD.layout && lD.layout.backgroundColor
+      ) {
+        backgroundColor = lD.layout.backgroundColor;
+      }
 
       // Choose a complementary color
       const color = $c.complement(backgroundColor);
@@ -1936,14 +1946,25 @@ const formHelpers = function() {
       });
 
       // Add same background colour to editor container as the layout's
-      const backgroundColor =
-      (
+      let backgroundColor = self.defaultBackgroundColor;
+
+      // From layout editor
+      if (
         self.mainObject != undefined &&
         typeof self.mainObject.backgroundColor != 'undefined' &&
         self.mainObject.backgroundColor != null
-      ) ?
-        self.mainObject.backgroundColor :
-        self.defaultBackgroundColor;
+      ) {
+        backgroundColor = self.mainObject.backgroundColor;
+      }
+
+      // From inline playlist editor
+      if (
+        self.namespace.inline &&
+        lD && lD.layout && lD.layout.backgroundColor
+      ) {
+        backgroundColor = lD.layout.backgroundColor;
+      }
+
       $editorContainer.parent().css('background-color', backgroundColor);
 
       // Get button container