Editor: Elements added in quick succession create multiple widgets (#…

…2749) relates to xibosignage/xibo#3486
xibosignage · Sep 30, 2024 · 1914bcc · 1914bcc
1 parent be2d16e
commit 1914bcc
Show file tree

Hide file tree

Showing 5 changed files with 1,127 additions and 1,020 deletions.
diff --git a/ui/src/editor-core/properties-panel.js b/ui/src/editor-core/properties-panel.js
@@ -231,7 +231,8 @@ PropertiesPanel.prototype.save = function(
             mainObject,
             {
               reloadPropertiesPanel: false,
-            }).done(() => {
+            },
+          ).then(() => {
             if (!target.drawerWidget) {
               app.viewer.renderRegion(
                 app.getObjectByTypeAndId('region', target.regionId),
@@ -1784,7 +1785,7 @@ PropertiesPanel.prototype.render = function(
                 mainObject,
                 {
                   reloadPropertiesPanel: false,
-                }).done(() => {
+                }).then(() => {
                 if (!target.drawerWidget) {
                   app.viewer.renderRegion(
                     app.getObjectByTypeAndId('region', target.regionId),
@@ -2861,7 +2862,7 @@ PropertiesPanel.prototype.showWidgetControl = function(target) {
             {
               reloadPropertiesPanel: false,
             },
-          ).done(() => {
+          ).then(() => {
             // Add options to dropdown
             const $select =
               $canvasWidgetSelectorControl.find('select');

diff --git a/ui/src/editor-core/widget.js b/ui/src/editor-core/widget.js
@@ -824,7 +824,7 @@ Widget.prototype.saveElements = function(
       return;
     }
 
-    app.reloadData(app.layout,
+    return app.reloadData(app.layout,
       {
         refreshEditor: updateEditor,
       });
@@ -1068,8 +1068,10 @@ Widget.prototype.saveElements = function(
       // Clear request var after response
       self.saveElementsRequest = undefined;
 
+      lD.common.hideLoadingScreen();
+
       if (res.success) {
-        reloadLayout();
+        return reloadLayout();
       } else {
         // Login Form needed?
         if (res.login) {
@@ -1085,7 +1087,6 @@ Widget.prototype.saveElements = function(
           }
         }
       }
-      lD.common.hideLoadingScreen();
     });
 
     // If this request is forced, save flag and return request