Ensure segmentation form is correctly reset (#22047)

matomo-org · Mar 28, 2024 · 1765f5f · 1765f5f
1 parent ad484fb
commit 1765f5f
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/plugins/SegmentEditor/javascripts/Segmentation.js b/plugins/SegmentEditor/javascripts/Segmentation.js
@@ -592,9 +592,7 @@ Segmentation = (function($) {
         var addForm = function(mode, segment){
 
             self.target.find(".segment-element:visible").unbind().remove();
-            if (typeof self.form !== "undefined") {
-                closeForm();
-            }
+            closeForm();
             // remove any remaining forms
 
 
@@ -670,19 +668,21 @@ Segmentation = (function($) {
             });
             app.mount(segmentGeneratorContainer);
 
-            this.addEventListener('matomoVueDestroy', function () {
+            segmentGeneratorContainer.addEventListener('matomoVueDestroy', function () {
               app.unmount();
             });
         };
 
         var closeForm = function () {
-            $(self.form).find('.segment-generator-container')[0].dispatchEvent(
-              new CustomEvent('matomoVueDestroy'),
-            );
-
             self.currentSegmentStr = '';
 
-            $(self.form).unbind().remove();
+            if (typeof self.form !== "undefined") {
+              $(self.form).find('.segment-generator-container')[0].dispatchEvent(
+                new CustomEvent('matomoVueDestroy'),
+              );
+
+              $(self.form).unbind().remove();
+            }
             self.target.closest('.segmentEditorPanel').removeClass('editing');
         };