Layout Editor: you can't upload an image into an image placeholder (#…

…2752) relates to xibosignage/xibo#3488
xibosignage · Oct 2, 2024 · fdff166 · fdff166
1 parent 8d78e5f
commit fdff166
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/ui/src/editor-core/toolbar.js b/ui/src/editor-core/toolbar.js
@@ -1621,8 +1621,13 @@ Toolbar.prototype.handleDroppables = function(draggable, customClasses = '') {
 
     // Image placeholder
     if (
-      $(draggable).data('type') === 'media' &&
-      $(draggable).data('subType') === 'image'
+      (
+        $(draggable).data('type') === 'media' &&
+        $(draggable).data('subType') === 'image'
+      ) || (
+        $(draggable).data('type') === 'widget' &&
+        $(draggable).data('subType') === 'image'
+      )
     ) {
       selectorBuild.push(
         '.designer-element[data-sub-type="image_placeholder"]',

diff --git a/ui/src/layout-editor/main.js b/ui/src/layout-editor/main.js
@@ -457,6 +457,9 @@ lD.selectObject =
         (
           $(card).data('type') === 'media' &&
           $(card).data('subType') === 'image'
+        ) || (
+          $(card).data('type') === 'widget' &&
+          $(card).data('subType') === 'image'
         )
       );
 

diff --git a/ui/src/layout-editor/viewer.js b/ui/src/layout-editor/viewer.js
@@ -636,8 +636,13 @@ Viewer.prototype.handleInteractions = function() {
       tolerance: 'pointer',
       accept: (draggable) => {
         return (
-          $(draggable).data('type') === 'media' &&
-          $(draggable).data('subType') === 'image'
+          (
+            $(draggable).data('type') === 'media' &&
+            $(draggable).data('subType') === 'image'
+          ) || (
+            $(draggable).data('type') === 'widget' &&
+            $(draggable).data('subType') === 'image'
+          )
         );
       },
       drop: _.debounce(function(event, ui) {