Remove position tab for drawer widget (xibosignage#2148)

* Remove position tab for drawer widget relates to xibosignageltd/xibo-private#516 * Drop to layout fix relates to xibosignageltd/xibo-private#516
nadzpogi · Oct 11, 2023 · c00c747 · c00c747
1 parent 7218bde
commit c00c747
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/ui/src/editor-core/properties-panel.js b/ui/src/editor-core/properties-panel.js
@@ -990,7 +990,11 @@ PropertiesPanel.prototype.render = function(
     if (
       app.mainObjectType === 'layout' &&
       (
-        target.type === 'widget' ||
+        (
+          target.type === 'widget' &&
+          // Don't show for drawer widget
+          target.drawerWidget != true
+        ) ||
         target.subType === 'playlist' ||
         isElementGroup
       )

diff --git a/ui/src/layout-editor/main.js b/ui/src/layout-editor/main.js
@@ -397,29 +397,32 @@ lD.selectObject =
     if (!$.isEmptyObject(this.toolbar.selectedCard)) {
       // Get card object
       const card = this.toolbar.selectedCard[0];
-      // Check if droppable is active
-      const activeDroppable = (target) ?
-        target.hasClass('ui-droppable-active') :
-        true;
 
       // Drop to target validations
       const dropToPlaylist = (
+        target &&
         target.data('subType') == 'playlist' &&
         lD.common.hasTarget(card, 'playlist')
       );
 
-      const dropToDrawerOrZone =
-        ['drawer', 'zone'].includes(target.data('subType'));
+      const dropToDrawerOrZone = (
+        target &&
+        ['drawer', 'zone'].includes(target.data('subType'))
+      );
 
       const dropToWidget = (
+        target &&
         target.hasClass('designer-widget') &&
-        activeDroppable
+        target.hasClass('ui-droppable-active')
       );
 
-      const dropToActionTarget =
-        target.hasClass('ui-droppable-actions-target');
+      const dropToActionTarget = (
+        target &&
+        target.hasClass('ui-droppable-actions-target')
+      );
 
       const dropToElementAndElGroup = (
+        target &&
         (
           target.hasClass('designer-element-group') ||
           target.hasClass('designer-element')